[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:11:11 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 1267f07a3bc995e775bf01df5f7bdcbfe4aa596c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue May 7 21:10:38 2002 +0000
WebCore:
Move more plugin code into WebKit.
Stop using IF for anything in WebCore to help make it clear what's part of
the BSD licensed stuff and what's part of our proprietary stuff.
* libwebcore.exp: Names of what exported changed.
* kwq/Makefile.am: Source file names changed.
* kwq/IFTextRenderer.h: Renamed to WebCoreTextRenderer.
* kwq/IFTextRendererFactory.h: Renamed to WebCoreTextRendererFactory.
* kwq/IFTextRendererFactory.m: Renamed to WebCoreTextRendererFactory.
* kwq/WebCoreTextRenderer.h: Renamed from IFTextRenderer.
* kwq/WebCoreTextRendererFactory.h: Renamed from IFTextRendererFactory.
* kwq/WebCoreTextRendererFactory.m: Renamed from IFTextRendererFactory.
* kwq/KWQFontMetrics.mm:
* kwq/KWQPainter.mm:
Updated for IF -> WebCore name change.
* kwq/WebCoreViewFactory.h: Added.
* kwq/WebCoreViewFactory.m: Added.
* kwq/KWQKConfigBase.mm: (KConfig::readEntry): (KConfig::readNumEntry):
Use the new [WebCoreViewFactory pluginsInfo] so we don't have to have
the plugin database in WebCore any more.
* kwq/WCJavaAppletWidget.h:
* kwq/WCJavaAppletWidget.mm: (IFJavaAppletWidgetCreate):
* kwq/WCPluginWidget.h:
* kwq/WCPluginWidget.mm: (IFPluginWidgetCreate):
Remove creation function machinery, and use the WebCoreViewFactory instead.
* kwq/WCPlugin.h: Moved to WebKit.
* kwq/WCPlugin.mm: Moved to WebKit.
* kwq/WCPluginDatabase.h: Moved to WebKit.
* kwq/WCPluginDatabase.mm: Moved to WebKit.
* kwq/npapi.h: Moved to WebKit.
* kwq/npapi.mm: Moved to WebKit.
WebKit:
Move more plugin code here from WebCore.
* IFWebCoreViewFactory.h: Added.
* IFWebCoreViewFactory.m: Added.
* Plugins.subproj/IFPlugin.h: Moved from WebCore.
* Plugins.subproj/IFPlugin.m: Moved from WebCore.
* Plugins.subproj/IFPluginDatabase.h: Moved from WebCore.
* Plugins.subproj/IFPluginDatabase.m: Moved from WebCore.
* Plugins.subproj/npapi.h: Moved from WebCore.
* Plugins.subproj/npapi.m: Moved from WebCore.
* WebKit.pbproj/project.pbxproj: Source file names changed
* MIME.subproj/IFMIMEDatabase.m:
* MIME.subproj/IFMIMEHandler.m:
* Plugins.subproj/IFPluginView.h:
* Plugins.subproj/IFPluginView.mm:
Updated for WC -> IF name change.
* WebCoreSupport.subproj/IFCachedTextRenderer.h: Renamed to IFTextRenderer.
* WebCoreSupport.subproj/IFCachedTextRenderer.m: Renamed to IFTextRenderer.
* WebCoreSupport.subproj/IFCachedTextRendererFactory.h: Renamed to IFTextRendererFactory.
* WebCoreSupport.subproj/IFCachedTextRendererFactory.m: Renamed to IFTextRendererFactory.
* WebCoreSupport.subproj/IFTextRenderer.h: Renamed from IFCachedTextRenderer.
* WebCoreSupport.subproj/IFTextRenderer.m: Renamed from IFCachedTextRenderer.
* WebCoreSupport.subproj/IFTextRendererFactory.h: Renamed from IFCachedTextRendererFactory.
* WebCoreSupport.subproj/IFTextRendererFactory.m: Renamed from IFCachedTextRendererFactory.
Renamed to take "Cached" out of the name now that the simpler name is
available.
* WebView.subproj/IFWebView.mm:
(-[IFWebView initWithFrame:]): Create shared IFWebCoreViewFactory.
(-[IFWebView delayLayout:]): Use WEBKITDEBUG, not KWQDEBUG.
(-[IFWebView notificationReceived:]): Use WEBKITDEBUG, not KWQDEBUG.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1105 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 4ab34bd..d95cf8e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,44 @@
+2002-05-07 Darin Adler <darin at apple.com>
+
+ Move more plugin code into WebKit.
+
+ Stop using IF for anything in WebCore to help make it clear what's part of
+ the BSD licensed stuff and what's part of our proprietary stuff.
+
+ * libwebcore.exp: Names of what exported changed.
+ * kwq/Makefile.am: Source file names changed.
+
+ * kwq/IFTextRenderer.h: Renamed to WebCoreTextRenderer.
+ * kwq/IFTextRendererFactory.h: Renamed to WebCoreTextRendererFactory.
+ * kwq/IFTextRendererFactory.m: Renamed to WebCoreTextRendererFactory.
+ * kwq/WebCoreTextRenderer.h: Renamed from IFTextRenderer.
+ * kwq/WebCoreTextRendererFactory.h: Renamed from IFTextRendererFactory.
+ * kwq/WebCoreTextRendererFactory.m: Renamed from IFTextRendererFactory.
+
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQPainter.mm:
+ Updated for IF -> WebCore name change.
+
+ * kwq/WebCoreViewFactory.h: Added.
+ * kwq/WebCoreViewFactory.m: Added.
+
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry): (KConfig::readNumEntry):
+ Use the new [WebCoreViewFactory pluginsInfo] so we don't have to have
+ the plugin database in WebCore any more.
+
+ * kwq/WCJavaAppletWidget.h:
+ * kwq/WCJavaAppletWidget.mm: (IFJavaAppletWidgetCreate):
+ * kwq/WCPluginWidget.h:
+ * kwq/WCPluginWidget.mm: (IFPluginWidgetCreate):
+ Remove creation function machinery, and use the WebCoreViewFactory instead.
+
+ * kwq/WCPlugin.h: Moved to WebKit.
+ * kwq/WCPlugin.mm: Moved to WebKit.
+ * kwq/WCPluginDatabase.h: Moved to WebKit.
+ * kwq/WCPluginDatabase.mm: Moved to WebKit.
+ * kwq/npapi.h: Moved to WebKit.
+ * kwq/npapi.mm: Moved to WebKit.
+
2002-05-06 Darin Adler <darin at apple.com>
* WebCorePrefix.h: Added.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4ab34bd..d95cf8e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,44 @@
+2002-05-07 Darin Adler <darin at apple.com>
+
+ Move more plugin code into WebKit.
+
+ Stop using IF for anything in WebCore to help make it clear what's part of
+ the BSD licensed stuff and what's part of our proprietary stuff.
+
+ * libwebcore.exp: Names of what exported changed.
+ * kwq/Makefile.am: Source file names changed.
+
+ * kwq/IFTextRenderer.h: Renamed to WebCoreTextRenderer.
+ * kwq/IFTextRendererFactory.h: Renamed to WebCoreTextRendererFactory.
+ * kwq/IFTextRendererFactory.m: Renamed to WebCoreTextRendererFactory.
+ * kwq/WebCoreTextRenderer.h: Renamed from IFTextRenderer.
+ * kwq/WebCoreTextRendererFactory.h: Renamed from IFTextRendererFactory.
+ * kwq/WebCoreTextRendererFactory.m: Renamed from IFTextRendererFactory.
+
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQPainter.mm:
+ Updated for IF -> WebCore name change.
+
+ * kwq/WebCoreViewFactory.h: Added.
+ * kwq/WebCoreViewFactory.m: Added.
+
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry): (KConfig::readNumEntry):
+ Use the new [WebCoreViewFactory pluginsInfo] so we don't have to have
+ the plugin database in WebCore any more.
+
+ * kwq/WCJavaAppletWidget.h:
+ * kwq/WCJavaAppletWidget.mm: (IFJavaAppletWidgetCreate):
+ * kwq/WCPluginWidget.h:
+ * kwq/WCPluginWidget.mm: (IFPluginWidgetCreate):
+ Remove creation function machinery, and use the WebCoreViewFactory instead.
+
+ * kwq/WCPlugin.h: Moved to WebKit.
+ * kwq/WCPlugin.mm: Moved to WebKit.
+ * kwq/WCPluginDatabase.h: Moved to WebKit.
+ * kwq/WCPluginDatabase.mm: Moved to WebKit.
+ * kwq/npapi.h: Moved to WebKit.
+ * kwq/npapi.mm: Moved to WebKit.
+
2002-05-06 Darin Adler <darin at apple.com>
* WebCorePrefix.h: Added.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4ab34bd..d95cf8e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,44 @@
+2002-05-07 Darin Adler <darin at apple.com>
+
+ Move more plugin code into WebKit.
+
+ Stop using IF for anything in WebCore to help make it clear what's part of
+ the BSD licensed stuff and what's part of our proprietary stuff.
+
+ * libwebcore.exp: Names of what exported changed.
+ * kwq/Makefile.am: Source file names changed.
+
+ * kwq/IFTextRenderer.h: Renamed to WebCoreTextRenderer.
+ * kwq/IFTextRendererFactory.h: Renamed to WebCoreTextRendererFactory.
+ * kwq/IFTextRendererFactory.m: Renamed to WebCoreTextRendererFactory.
+ * kwq/WebCoreTextRenderer.h: Renamed from IFTextRenderer.
+ * kwq/WebCoreTextRendererFactory.h: Renamed from IFTextRendererFactory.
+ * kwq/WebCoreTextRendererFactory.m: Renamed from IFTextRendererFactory.
+
+ * kwq/KWQFontMetrics.mm:
+ * kwq/KWQPainter.mm:
+ Updated for IF -> WebCore name change.
+
+ * kwq/WebCoreViewFactory.h: Added.
+ * kwq/WebCoreViewFactory.m: Added.
+
+ * kwq/KWQKConfigBase.mm: (KConfig::readEntry): (KConfig::readNumEntry):
+ Use the new [WebCoreViewFactory pluginsInfo] so we don't have to have
+ the plugin database in WebCore any more.
+
+ * kwq/WCJavaAppletWidget.h:
+ * kwq/WCJavaAppletWidget.mm: (IFJavaAppletWidgetCreate):
+ * kwq/WCPluginWidget.h:
+ * kwq/WCPluginWidget.mm: (IFPluginWidgetCreate):
+ Remove creation function machinery, and use the WebCoreViewFactory instead.
+
+ * kwq/WCPlugin.h: Moved to WebKit.
+ * kwq/WCPlugin.mm: Moved to WebKit.
+ * kwq/WCPluginDatabase.h: Moved to WebKit.
+ * kwq/WCPluginDatabase.mm: Moved to WebKit.
+ * kwq/npapi.h: Moved to WebKit.
+ * kwq/npapi.mm: Moved to WebKit.
+
2002-05-06 Darin Adler <darin at apple.com>
* WebCorePrefix.h: Added.
diff --git a/WebCore/kwq/KWQFontMetrics.mm b/WebCore/kwq/KWQFontMetrics.mm
index f663b09..902028b 100644
--- a/WebCore/kwq/KWQFontMetrics.mm
+++ b/WebCore/kwq/KWQFontMetrics.mm
@@ -28,21 +28,21 @@
#include <Cocoa/Cocoa.h>
#import <qfont.h>
-#import <IFTextRendererFactory.h>
-#import <IFTextRenderer.h>
+#import <WebCoreTextRendererFactory.h>
+#import <WebCoreTextRenderer.h>
#import <kwqdebug.h>
struct QFontMetricsPrivate
{
QFontMetricsPrivate(const QFont &font)
{
- renderer = [[[IFTextRendererFactory sharedFactory] rendererWithFamily:font.getNSFamily() traits:font.getNSTraits() size:font.getNSSize()] retain];
+ renderer = [[[WebCoreTextRendererFactory sharedFactory] rendererWithFamily:font.getNSFamily() traits:font.getNSTraits() size:font.getNSSize()] retain];
}
~QFontMetricsPrivate()
{
[renderer release];
}
- id <IFTextRenderer> getRenderer()
+ id <WebCoreTextRenderer> getRenderer()
{
return renderer;
}
@@ -50,7 +50,7 @@ struct QFontMetricsPrivate
int refCount;
private:
- id <IFTextRenderer> renderer;
+ id <WebCoreTextRenderer> renderer;
};
QFontMetrics::QFontMetrics()
diff --git a/WebCore/kwq/KWQKConfigBase.mm b/WebCore/kwq/KWQKConfigBase.mm
index d5be042..081f0bb 100644
--- a/WebCore/kwq/KWQKConfigBase.mm
+++ b/WebCore/kwq/KWQKConfigBase.mm
@@ -28,8 +28,7 @@
#import <kwqdebug.h>
#import <qcolor.h>
#import <qstringlist.h>
-#import <WCPlugin.h>
-#import <WCPluginDatabase.h>
+#import <WebCoreViewFactory.h>
class KWQKConfigImpl
{
@@ -67,12 +66,12 @@ void KConfig::writeEntry(const QString &pKey, const QStringList &rValue,
QString KConfig::readEntry(const char *pKey, const QString& aDefault=QString::null) const
{
if (impl->isPluginInfo) {
- WCPlugin *plugin;
+ id <WebCorePluginInfo> plugin;
NSArray *mimeTypes;
NSMutableString *bigMimeString;
uint i;
- plugin = [[[WCPluginDatabase installedPlugins] plugins] objectAtIndex:impl->pluginIndex];
+ plugin = [[[WebCoreViewFactory sharedFactory] pluginsInfo] objectAtIndex:impl->pluginIndex];
if (strcmp(pKey, "name") == 0) {
return NSSTRING_TO_QSTRING([plugin name]);
} else if (strcmp(pKey, "file") == 0) {
@@ -101,7 +100,7 @@ QString KConfig::readEntry(const char *pKey, const QString& aDefault=QString::nu
int KConfig::readNumEntry(const char *pKey, int nDefault) const
{
if (impl->isPluginInfo) {
- return [[[WCPluginDatabase installedPlugins] plugins] count];
+ return [[[WebCoreViewFactory sharedFactory] pluginsInfo] count];
}
_logNotYetImplemented();
return nDefault;
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index f2ef1cd..39f8b14 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -32,8 +32,8 @@
#include <kwqdebug.h>
-#import <IFTextRendererFactory.h>
-#import <IFTextRenderer.h>
+#import <WebCoreTextRendererFactory.h>
+#import <WebCoreTextRenderer.h>
struct QPainterPrivate {
@@ -486,7 +486,7 @@ void QPainter::drawText(int x, int y, const QString &qstring, int len)
else
string = QSTRING_TO_NSSTRING_LENGTH(qstring,len);
- [[[IFTextRendererFactory sharedFactory]
+ [[[WebCoreTextRendererFactory sharedFactory]
rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()]
drawString:string atPoint:NSMakePoint(x,y) withColor:data->qpen.color().color];
@@ -521,7 +521,7 @@ void QPainter::drawUnderlineForText(int x, int y, const QString &qstring, int le
else
string = QSTRING_TO_NSSTRING_LENGTH(qstring,len);
- [[[IFTextRendererFactory sharedFactory]
+ [[[WebCoreTextRendererFactory sharedFactory]
rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()]
drawUnderlineForString:string atPoint:NSMakePoint(x,y) withColor:data->qpen.color().color];
@@ -557,7 +557,7 @@ void QPainter::drawText(int x, int y, int w, int h, int flags, const QString &qs
[style setAlignment: NSLeftTextAlignment];
}
- [[[IFTextRendererFactory sharedFactory]
+ [[[WebCoreTextRendererFactory sharedFactory]
rendererWithFamily:data->qfont.getNSFamily() traits:data->qfont.getNSTraits() size:data->qfont.getNSSize()]
drawString:string inRect:NSMakeRect(x, y, w, h) withColor:data->qpen.color().color paragraphStyle:style];
diff --git a/WebCore/kwq/Makefile.am b/WebCore/kwq/Makefile.am
index e8b4658..23e76c8 100644
--- a/WebCore/kwq/Makefile.am
+++ b/WebCore/kwq/Makefile.am
@@ -5,7 +5,6 @@ libkwq_o_ldflags = -Wl,-r -nostdlib
libkwq_o_AR = $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) $(libkwq_o_ldflags) -o
libkwq_o_SOURCES = \
- IFTextRendererFactory.m \
KWQApplication.mm \
KWQArrayImpl.mm \
KWQBitmap.mm \
@@ -129,11 +128,10 @@ libkwq_o_SOURCES = \
KWQtextstream.mm \
KWQxml.mm \
kwqdebug.mm \
- WCPlugin.mm \
- WCPluginDatabase.mm \
WCPluginWidget.mm \
WCJavaAppletWidget.mm \
- npapi.mm \
+ WebCoreTextRendererFactory.m \
+ WebCoreViewFactory.m \
$(NULL)
INCLUDES = \
diff --git a/WebCore/kwq/WCJavaAppletWidget.h b/WebCore/kwq/WCJavaAppletWidget.h
index 7c479cb..48206fc 100644
--- a/WebCore/kwq/WCJavaAppletWidget.h
+++ b/WebCore/kwq/WCJavaAppletWidget.h
@@ -31,17 +31,6 @@
class QWidget;
-#ifdef __OBJC__
- at class NSDictionary;
- at class NSView;
-#else
-typedef void NSDictionary;
-typedef void NSView;
-#endif
-
QWidget *IFJavaAppletWidgetCreate(const QMap<QString, QString> &args);
-typedef NSView *(*IFJavaAppletViewCreationFunction)(NSDictionary *arguments);
-void IFSetJavaAppletViewCreationFunction(IFJavaAppletViewCreationFunction);
-
#endif
diff --git a/WebCore/kwq/WCJavaAppletWidget.mm b/WebCore/kwq/WCJavaAppletWidget.mm
index 8fd1a6a..8fa165c 100644
--- a/WebCore/kwq/WCJavaAppletWidget.mm
+++ b/WebCore/kwq/WCJavaAppletWidget.mm
@@ -25,13 +25,7 @@
#import "WCJavaAppletWidget.h"
#import <qwidget.h>
-
-static IFJavaAppletViewCreationFunction creationFunction = NULL;
-
-void IFSetJavaAppletViewCreationFunction(IFJavaAppletViewCreationFunction f)
-{
- creationFunction = f;
-}
+#import <WebCoreViewFactory.h>
QWidget *IFJavaAppletWidgetCreate(const QMap<QString, QString> &args)
{
@@ -40,8 +34,6 @@ QWidget *IFJavaAppletWidgetCreate(const QMap<QString, QString> &args)
[argsDictionary setObject:it.data().getNSString() forKey:it.key().getNSString()];
}
QWidget *widget = new QWidget();
- if (creationFunction) {
- widget->setView(creationFunction(argsDictionary));
- }
+ widget->setView([[WebCoreViewFactory sharedFactory] viewForJavaAppletWithArguments:argsDictionary]);
return widget;
}
diff --git a/WebCore/kwq/WCPluginWidget.h b/WebCore/kwq/WCPluginWidget.h
index 2bad54e..d041430 100644
--- a/WebCore/kwq/WCPluginWidget.h
+++ b/WebCore/kwq/WCPluginWidget.h
@@ -30,13 +30,6 @@ class QString;
class QStringList;
class QWidget;
- at class NSArray;
- at class NSString;
- at class NSView;
-
QWidget *IFPluginWidgetCreate(const QString &url, const QString &serviceType, const QStringList &args, const QString &baseURL);
-typedef NSView *(*IFPluginViewCreationFunction)(NSString *url, NSString *serviceType, NSArray *arguments, NSString *baseURL);
-void IFSetPluginViewCreationFunction(IFPluginViewCreationFunction);
-
#endif
diff --git a/WebCore/kwq/WCPluginWidget.mm b/WebCore/kwq/WCPluginWidget.mm
index 8d92970..3715ee4 100644
--- a/WebCore/kwq/WCPluginWidget.mm
+++ b/WebCore/kwq/WCPluginWidget.mm
@@ -25,13 +25,7 @@
#import "WCPluginWidget.h"
#import <qwidget.h>
-
-static IFPluginViewCreationFunction creationFunction = 0;
-
-void IFSetPluginViewCreationFunction(IFPluginViewCreationFunction f)
-{
- creationFunction = f;
-}
+#import <WebCoreViewFactory.h>
QWidget *IFPluginWidgetCreate(const QString &url, const QString &serviceType, const QStringList &args, const QString &baseURL)
{
@@ -40,8 +34,10 @@ QWidget *IFPluginWidgetCreate(const QString &url, const QString &serviceType, co
[argsArray addObject:args[i].getNSString()];
}
QWidget *widget = new QWidget();
- if (creationFunction) {
- widget->setView(creationFunction(url.getNSString(), serviceType.getNSString(), argsArray, baseURL.getNSString()));
- }
+ widget->setView([[WebCoreViewFactory sharedFactory]
+ viewForPluginWithURL:url.getNSString()
+ serviceType:serviceType.getNSString()
+ arguments:argsArray
+ baseURL:baseURL.getNSString()]);
return widget;
}
diff --git a/WebCore/kwq/IFTextRenderer.h b/WebCore/kwq/WebCoreTextRenderer.h
similarity index 97%
rename from WebCore/kwq/IFTextRenderer.h
rename to WebCore/kwq/WebCoreTextRenderer.h
index 23e681c..1b45c57 100644
--- a/WebCore/kwq/IFTextRenderer.h
+++ b/WebCore/kwq/WebCoreTextRenderer.h
@@ -25,7 +25,7 @@
#import <Cocoa/Cocoa.h>
- at protocol IFTextRenderer <NSObject>
+ at protocol WebCoreTextRenderer <NSObject>
- (int)widthForString:(NSString *)string;
- (int)ascent;
diff --git a/WebCore/kwq/IFTextRendererFactory.h b/WebCore/kwq/WebCoreTextRendererFactory.h
similarity index 85%
rename from WebCore/kwq/IFTextRendererFactory.h
rename to WebCore/kwq/WebCoreTextRendererFactory.h
index a6e3210..bf703f1 100644
--- a/WebCore/kwq/IFTextRendererFactory.h
+++ b/WebCore/kwq/WebCoreTextRendererFactory.h
@@ -25,14 +25,14 @@
#import <Cocoa/Cocoa.h>
- at protocol IFTextRenderer;
+ at protocol WebCoreTextRenderer;
- at interface IFTextRendererFactory : NSObject
+ at interface WebCoreTextRendererFactory : NSObject
{
}
-+ (IFTextRendererFactory *)sharedFactory;
++ (WebCoreTextRendererFactory *)sharedFactory;
- init;
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size;
+- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size;
@end
diff --git a/WebCore/kwq/IFTextRendererFactory.m b/WebCore/kwq/WebCoreTextRendererFactory.m
similarity index 84%
copy from WebCore/kwq/IFTextRendererFactory.m
copy to WebCore/kwq/WebCoreTextRendererFactory.m
index 78e438d..f7ba9e4 100644
--- a/WebCore/kwq/IFTextRendererFactory.m
+++ b/WebCore/kwq/WebCoreTextRendererFactory.m
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "IFTextRendererFactory.h"
+#import "WebCoreTextRendererFactory.h"
#import <kwqdebug.h>
- at implementation IFTextRendererFactory
+ at implementation WebCoreTextRendererFactory
-static IFTextRendererFactory *sharedFactory;
+static WebCoreTextRendererFactory *sharedFactory;
-+ (IFTextRendererFactory *)sharedFactory
++ (WebCoreTextRendererFactory *)sharedFactory
{
return sharedFactory;
}
@@ -45,7 +45,7 @@ static IFTextRendererFactory *sharedFactory;
return self;
}
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
{
return nil;
}
diff --git a/WebCore/kwq/IFTextRendererFactory.m b/WebCore/kwq/WebCoreTextRendererFactory.mm
similarity index 84%
copy from WebCore/kwq/IFTextRendererFactory.m
copy to WebCore/kwq/WebCoreTextRendererFactory.mm
index 78e438d..f7ba9e4 100644
--- a/WebCore/kwq/IFTextRendererFactory.m
+++ b/WebCore/kwq/WebCoreTextRendererFactory.mm
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "IFTextRendererFactory.h"
+#import "WebCoreTextRendererFactory.h"
#import <kwqdebug.h>
- at implementation IFTextRendererFactory
+ at implementation WebCoreTextRendererFactory
-static IFTextRendererFactory *sharedFactory;
+static WebCoreTextRendererFactory *sharedFactory;
-+ (IFTextRendererFactory *)sharedFactory
++ (WebCoreTextRendererFactory *)sharedFactory
{
return sharedFactory;
}
@@ -45,7 +45,7 @@ static IFTextRendererFactory *sharedFactory;
return self;
}
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
{
return nil;
}
diff --git a/WebCore/kwq/WCPluginWidget.h b/WebCore/kwq/WebCoreViewFactory.h
similarity index 66%
copy from WebCore/kwq/WCPluginWidget.h
copy to WebCore/kwq/WebCoreViewFactory.h
index 2bad54e..8157faf 100644
--- a/WebCore/kwq/WCPluginWidget.h
+++ b/WebCore/kwq/WebCoreViewFactory.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2002 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,20 +23,34 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WCPluginWidget_H_
-#define WCPluginWidget_H_
-
-class QString;
-class QStringList;
-class QWidget;
+#import <Cocoa/Cocoa.h>
@class NSArray;
@class NSString;
@class NSView;
-QWidget *IFPluginWidgetCreate(const QString &url, const QString &serviceType, const QStringList &args, const QString &baseURL);
-
-typedef NSView *(*IFPluginViewCreationFunction)(NSString *url, NSString *serviceType, NSArray *arguments, NSString *baseURL);
+typedef NSView *(*IFPluginViewCreationFunction)();
void IFSetPluginViewCreationFunction(IFPluginViewCreationFunction);
-#endif
+ at interface WebCoreViewFactory : NSObject
+{
+}
+
++ (WebCoreViewFactory *)sharedFactory;
+- init;
+
+- (NSView *)viewForPluginWithURL:(NSString *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSString *)baseURL;
+- (NSArray *)pluginsInfo; // array of id <WebCorePluginInfo>
+
+- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments;
+
+ at end
+
+ at protocol WebCorePluginInfo <NSObject>
+
+- (NSString *)name;
+- (NSString *)filename;
+- (NSString *)pluginDescription;
+- (NSArray *)mimeTypes; // array of NSArrays with 3 parts of MIME type in each
+
+ at end
diff --git a/WebCore/kwq/IFTextRendererFactory.m b/WebCore/kwq/WebCoreViewFactory.m
similarity index 78%
rename from WebCore/kwq/IFTextRendererFactory.m
rename to WebCore/kwq/WebCoreViewFactory.m
index 78e438d..a2c0dfe 100644
--- a/WebCore/kwq/IFTextRendererFactory.m
+++ b/WebCore/kwq/WebCoreViewFactory.m
@@ -23,14 +23,14 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "IFTextRendererFactory.h"
+#import "WebCoreViewFactory.h"
#import <kwqdebug.h>
- at implementation IFTextRendererFactory
+ at implementation WebCoreViewFactory
-static IFTextRendererFactory *sharedFactory;
+static WebCoreViewFactory *sharedFactory;
-+ (IFTextRendererFactory *)sharedFactory
++ (WebCoreViewFactory *)sharedFactory
{
return sharedFactory;
}
@@ -45,7 +45,17 @@ static IFTextRendererFactory *sharedFactory;
return self;
}
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (NSView *)viewForPluginWithURL:(NSString *)url serviceType:(NSString *)serviceType arguments:(NSArray *)arguments baseURL:(NSString *)baseURL;
+{
+ return nil;
+}
+
+- (NSArray *)pluginsInfo
+{
+ return nil;
+}
+
+- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments
{
return nil;
}
diff --git a/WebCore/libwebcore.exp b/WebCore/libwebcore.exp
index 8260ddb..25d9acd 100644
--- a/WebCore/libwebcore.exp
+++ b/WebCore/libwebcore.exp
@@ -1,9 +1,7 @@
-.objc_class_name_IFTextRendererFactory
-.objc_class_name_WCPluginDatabase
+.objc_class_name_WebCoreTextRendererFactory
+.objc_class_name_WebCoreViewFactory
__Z27WCSetIFLoadProgressMakeFuncPFP11objc_objectvE
__Z28WCSetIFWebDataSourceMakeFuncPFP11objc_objectPvE
-__Z31IFSetPluginViewCreationFunctionPFP6NSViewP8NSStringS2_P7NSArrayS2_E
-__Z35IFSetJavaAppletViewCreationFunctionPFP6NSViewP12NSDictionaryE
__ZN11QMouseEventC1EN6QEvent4TypeERK6QPointii
__ZN3DOM12DocumentImpl19updateStyleSelectorEv
__ZN3DOM9DOMStringD1Ev
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 40df954..bdfdc59 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,43 @@
2002-05-07 Darin Adler <darin at apple.com>
+ Move more plugin code here from WebCore.
+
+ * IFWebCoreViewFactory.h: Added.
+ * IFWebCoreViewFactory.m: Added.
+
+ * Plugins.subproj/IFPlugin.h: Moved from WebCore.
+ * Plugins.subproj/IFPlugin.m: Moved from WebCore.
+ * Plugins.subproj/IFPluginDatabase.h: Moved from WebCore.
+ * Plugins.subproj/IFPluginDatabase.m: Moved from WebCore.
+ * Plugins.subproj/npapi.h: Moved from WebCore.
+ * Plugins.subproj/npapi.m: Moved from WebCore.
+
+ * WebKit.pbproj/project.pbxproj: Source file names changed
+
+ * MIME.subproj/IFMIMEDatabase.m:
+ * MIME.subproj/IFMIMEHandler.m:
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm:
+ Updated for WC -> IF name change.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.h: Renamed to IFTextRenderer.
+ * WebCoreSupport.subproj/IFCachedTextRenderer.m: Renamed to IFTextRenderer.
+ * WebCoreSupport.subproj/IFCachedTextRendererFactory.h: Renamed to IFTextRendererFactory.
+ * WebCoreSupport.subproj/IFCachedTextRendererFactory.m: Renamed to IFTextRendererFactory.
+ * WebCoreSupport.subproj/IFTextRenderer.h: Renamed from IFCachedTextRenderer.
+ * WebCoreSupport.subproj/IFTextRenderer.m: Renamed from IFCachedTextRenderer.
+ * WebCoreSupport.subproj/IFTextRendererFactory.h: Renamed from IFCachedTextRendererFactory.
+ * WebCoreSupport.subproj/IFTextRendererFactory.m: Renamed from IFCachedTextRendererFactory.
+ Renamed to take "Cached" out of the name now that the simpler name is
+ available.
+
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView initWithFrame:]): Create shared IFWebCoreViewFactory.
+ (-[IFWebView delayLayout:]): Use WEBKITDEBUG, not KWQDEBUG.
+ (-[IFWebView notificationReceived:]): Use WEBKITDEBUG, not KWQDEBUG.
+
+2002-05-07 Darin Adler <darin at apple.com>
+
Use isEqualToString: instead of isEqual: more consistently. But only for strings.
* WebCoreSupport.subproj/IFCachedTextRendererFactory.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 40df954..bdfdc59 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,43 @@
2002-05-07 Darin Adler <darin at apple.com>
+ Move more plugin code here from WebCore.
+
+ * IFWebCoreViewFactory.h: Added.
+ * IFWebCoreViewFactory.m: Added.
+
+ * Plugins.subproj/IFPlugin.h: Moved from WebCore.
+ * Plugins.subproj/IFPlugin.m: Moved from WebCore.
+ * Plugins.subproj/IFPluginDatabase.h: Moved from WebCore.
+ * Plugins.subproj/IFPluginDatabase.m: Moved from WebCore.
+ * Plugins.subproj/npapi.h: Moved from WebCore.
+ * Plugins.subproj/npapi.m: Moved from WebCore.
+
+ * WebKit.pbproj/project.pbxproj: Source file names changed
+
+ * MIME.subproj/IFMIMEDatabase.m:
+ * MIME.subproj/IFMIMEHandler.m:
+ * Plugins.subproj/IFPluginView.h:
+ * Plugins.subproj/IFPluginView.mm:
+ Updated for WC -> IF name change.
+
+ * WebCoreSupport.subproj/IFCachedTextRenderer.h: Renamed to IFTextRenderer.
+ * WebCoreSupport.subproj/IFCachedTextRenderer.m: Renamed to IFTextRenderer.
+ * WebCoreSupport.subproj/IFCachedTextRendererFactory.h: Renamed to IFTextRendererFactory.
+ * WebCoreSupport.subproj/IFCachedTextRendererFactory.m: Renamed to IFTextRendererFactory.
+ * WebCoreSupport.subproj/IFTextRenderer.h: Renamed from IFCachedTextRenderer.
+ * WebCoreSupport.subproj/IFTextRenderer.m: Renamed from IFCachedTextRenderer.
+ * WebCoreSupport.subproj/IFTextRendererFactory.h: Renamed from IFCachedTextRendererFactory.
+ * WebCoreSupport.subproj/IFTextRendererFactory.m: Renamed from IFCachedTextRendererFactory.
+ Renamed to take "Cached" out of the name now that the simpler name is
+ available.
+
+ * WebView.subproj/IFWebView.mm:
+ (-[IFWebView initWithFrame:]): Create shared IFWebCoreViewFactory.
+ (-[IFWebView delayLayout:]): Use WEBKITDEBUG, not KWQDEBUG.
+ (-[IFWebView notificationReceived:]): Use WEBKITDEBUG, not KWQDEBUG.
+
+2002-05-07 Darin Adler <darin at apple.com>
+
Use isEqualToString: instead of isEqual: more consistently. But only for strings.
* WebCoreSupport.subproj/IFCachedTextRendererFactory.m:
diff --git a/WebKit/IFWebCoreViewFactory.h b/WebKit/IFWebCoreViewFactory.h
new file mode 100644
index 0000000..84f6a51
--- /dev/null
+++ b/WebKit/IFWebCoreViewFactory.h
@@ -0,0 +1,17 @@
+//
+// IFWebCoreViewFactory.h
+// WebKit
+//
+// Created by Darin Adler on Tue May 07 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebCoreViewFactory.h>
+
+ at interface IFWebCoreViewFactory : WebCoreViewFactory
+{
+}
+
++ (void)createSharedFactory;
+
+ at end
diff --git a/WebKit/IFWebCoreViewFactory.m b/WebKit/IFWebCoreViewFactory.m
new file mode 100644
index 0000000..460a9a3
--- /dev/null
+++ b/WebKit/IFWebCoreViewFactory.m
@@ -0,0 +1,88 @@
+//
+// IFWebCoreViewFactory.m
+// WebKit
+//
+// Created by Darin Adler on Tue May 07 2002.
+// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import "IFWebCoreViewFactory.h"
+#import "IFPluginDatabase.h"
+#import "IFPluginView.h"
+#import "IFNullPluginView.h"
+#import "WebKitDebug.h"
+
+ at implementation IFWebCoreViewFactory
+
++ (void)createSharedFactory;
+{
+ if (![self sharedFactory]) {
+ [[[self alloc] init] release];
+ }
+ WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
+}
+
+- (NSView *)viewForPluginWithURL:(NSString *)pluginURL serviceType:(NSString *)serviceType arguments:(NSArray *)args baseURL:(NSString *)baseURL
+{
+ NSMutableDictionary *arguments;
+ NSString *mimeType;
+ NSRange r1, r2, r3;
+ IFPlugin *plugin;
+ uint i;
+
+ arguments = [NSMutableDictionary dictionary];
+ for (i = 0; i < [args count]; i++){
+ NSString *arg = [args objectAtIndex:i];
+ if ([arg rangeOfString:@"__KHTML__"].length == 0) {
+ r1 = [arg rangeOfString:@"="]; // parse out attributes and values
+ r2 = [arg rangeOfString:@"\""];
+ r3.location = r2.location + 1;
+ r3.length = [arg length] - r2.location - 2; // don't include quotes
+ [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
+ }
+ }
+
+ if ([baseURL length]) {
+ [arguments setObject:baseURL forKey:@"WebKitBaseURL"];
+ }
+
+ if ([serviceType length]) {
+ mimeType = serviceType;
+ plugin = [[IFPluginDatabase installedPlugins] getPluginForMimeType:mimeType];
+ } else {
+ plugin = [[IFPluginDatabase installedPlugins] getPluginForExtension:[pluginURL pathExtension]];
+ mimeType = [plugin mimeTypeForURL:pluginURL];
+ }
+
+ if (plugin == nil) {
+ return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
+ }
+ return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL mime:mimeType arguments:arguments mode:NP_EMBED] autorelease];
+}
+
+- (NSArray *)pluginsInfo
+{
+ return [[IFPluginDatabase installedPlugins] plugins];
+}
+
+- (NSView *)viewForJavaAppletWithArguments:(NSDictionary *)arguments
+{
+ IFPlugin *plugin;
+ NSMutableDictionary *argsCopy;
+
+ plugin = [[IFPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
+ if (plugin == nil) {
+ return nil;
+ }
+
+ argsCopy = [NSMutableDictionary dictionaryWithDictionary:arguments];
+ [argsCopy setObject:[argsCopy objectForKey:@"baseURL"] forKey:@"DOCBASE"];
+ [argsCopy removeObjectForKey:@"baseURL"];
+
+ if (plugin == nil) {
+ return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:@"application/x-java-applet" arguments:argsCopy] autorelease];
+ }
+ return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:nil mime:@"application/x-java-applet" arguments:argsCopy mode:NP_EMBED] autorelease];
+}
+
+ at end
diff --git a/WebKit/MIME.subproj/IFMIMEDatabase.m b/WebKit/MIME.subproj/IFMIMEDatabase.m
index a9fd918..d2705ed 100644
--- a/WebKit/MIME.subproj/IFMIMEDatabase.m
+++ b/WebKit/MIME.subproj/IFMIMEDatabase.m
@@ -9,8 +9,8 @@
#import "IFMIMEDatabase.h"
#import "IFMIMEHandler.h"
-#import <WCPluginDatabase.h>
-#import <WCPlugin.h>
+#import <IFPluginDatabase.h>
+#import <IFPlugin.h>
NSMutableDictionary *setMimeHandlers(void);
@@ -32,8 +32,8 @@ static IFMIMEDatabase *sharedMIMEDatabase = nil;
- (IFMIMEHandler *)MIMEHandlerForMIMEType:(NSString *)mimeType
{
IFMIMEHandler *tempHandler;
- WCPluginDatabase *pluginDatabase;
- WCPlugin *plugin;
+ IFPluginDatabase *pluginDatabase;
+ IFPlugin *plugin;
if(!mimeType)
return [[[IFMIMEHandler alloc] initWithMIMEType:mimeType handlerType:IFMIMEHANDLERTYPE_NIL handlerName:nil] autorelease];
@@ -42,7 +42,7 @@ static IFMIMEDatabase *sharedMIMEDatabase = nil;
if(tempHandler){
return tempHandler;
}else{
- pluginDatabase = [WCPluginDatabase installedPlugins];
+ pluginDatabase = [IFPluginDatabase installedPlugins];
plugin = [pluginDatabase getPluginForMimeType:mimeType];
if(plugin){
return [[[IFMIMEHandler alloc] initWithMIMEType:mimeType handlerType:IFMIMEHANDLERTYPE_PLUGIN handlerName:[plugin name]] autorelease];
diff --git a/WebKit/MIME.subproj/IFMIMEHandler.m b/WebKit/MIME.subproj/IFMIMEHandler.m
index 03427b1..c7eff4e 100644
--- a/WebKit/MIME.subproj/IFMIMEHandler.m
+++ b/WebKit/MIME.subproj/IFMIMEHandler.m
@@ -8,7 +8,7 @@
#import <WebKit/IFMIMEHandler.h>
#import <WebKit/WebKitDebug.h>
-#import <WCPluginDatabase.h>
+#import <IFPluginDatabase.h>
static NSArray *MIMETypes = nil;
@@ -34,7 +34,7 @@ static NSArray *MIMETypes = nil;
@"image/png",
@"image/gif",
@"image/jpg",
- @"image/jpeg", nil] arrayByAddingObjectsFromArray:[[WCPluginDatabase installedPlugins] allHandledMIMETypes]];
+ @"image/jpeg", nil] arrayByAddingObjectsFromArray:[[IFPluginDatabase installedPlugins] allHandledMIMETypes]];
[MIMETypes retain];
}
return MIMETypes;
diff --git a/WebCore/kwq/WCPlugin.h b/WebKit/Plugins.subproj/IFPlugin.h
similarity index 95%
copy from WebCore/kwq/WCPlugin.h
copy to WebKit/Plugins.subproj/IFPlugin.h
index a0b3536..cbd3ed3 100644
--- a/WebCore/kwq/WCPlugin.h
+++ b/WebKit/Plugins.subproj/IFPlugin.h
@@ -24,9 +24,11 @@
*/
#import <Foundation/Foundation.h>
-#include "npapi.h"
+#import "npapi.h"
+#import <WebCoreViewFactory.h>
- at interface WCPlugin : NSObject {
+ at interface IFPlugin : NSObject <WebCorePluginInfo>
+{
NSMutableArray *mimeTypes;
NSString *name, *path, *filename, *pluginDescription;
BOOL isLoaded, isBundle, isCFM;
@@ -58,13 +60,9 @@
- (void)load;
- (void)unload;
- (NSString *)mimeTypeForURL:(NSString *)URL;
-- (NSArray *)mimeTypes;
-- (NSString *)name;
-- (NSString *)filename;
- (NSString *)path;
- (BOOL)isLoaded;
- (NSString *)description;
-- (NSString *)pluginDescription;
- (NPP_NewProcPtr)NPP_New;
- (NPP_DestroyProcPtr)NPP_Destroy;
diff --git a/WebCore/kwq/WCPlugin.mm b/WebKit/Plugins.subproj/IFPlugin.m
similarity index 95%
copy from WebCore/kwq/WCPlugin.mm
copy to WebKit/Plugins.subproj/IFPlugin.m
index 0863e12..bf1ddbe 100644
--- a/WebCore/kwq/WCPlugin.mm
+++ b/WebKit/Plugins.subproj/IFPlugin.m
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WCPlugin.h"
-#include "kwqdebug.h"
+#import "IFPlugin.h"
+#import "WebKitDebug.h"
- at implementation WCPlugin
+ at implementation IFPlugin
- (BOOL)initializeWithPath:(NSString *)pluginPath
{
@@ -45,12 +45,12 @@
if([[fileInfo objectForKey:@"NSFileHFSTypeCode"] unsignedLongValue] == 1112690764){ // 1112690764 = 'BRPL'
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: FSPathMakeRef failed. Error=%d\n", err);
return FALSE;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
- KWQDEBUG("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
+ WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return FALSE;
}
[self getPluginInfoForResourceFile:resRef];
@@ -174,17 +174,17 @@
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: GetDiskFragment failed. Error=%d\n", err);
return;
}
pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
@@ -219,7 +219,7 @@
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
- KWQDEBUG("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
+ WEBKITDEBUG("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
NPP_New = (NPP_NewProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.newp);
NPP_Destroy = (NPP_DestroyProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.destroy);
@@ -279,7 +279,7 @@
NPP_GetValue = pluginFuncs.getvalue;
NPP_SetValue = pluginFuncs.setvalue;
}
- KWQDEBUG("Plugin Loaded\n");
+ WEBKITDEBUG("Plugin Loaded\n");
isLoaded = TRUE;
}
@@ -292,7 +292,7 @@
}else{
CloseConnection(&connID);
}
- KWQDEBUG("Plugin Unloaded\n");
+ WEBKITDEBUG("Plugin Unloaded\n");
isLoaded = FALSE;
}
diff --git a/WebCore/kwq/WCPluginDatabase.h b/WebKit/Plugins.subproj/IFPluginDatabase.h
similarity index 83%
copy from WebCore/kwq/WCPluginDatabase.h
copy to WebKit/Plugins.subproj/IFPluginDatabase.h
index 3255d0b..54851c9 100644
--- a/WebCore/kwq/WCPluginDatabase.h
+++ b/WebKit/Plugins.subproj/IFPluginDatabase.h
@@ -24,16 +24,16 @@
*/
#import <Foundation/Foundation.h>
-#import <WCPlugin.h>
+#import <IFPlugin.h>
- at interface WCPluginDatabase : NSObject {
+ at interface IFPluginDatabase : NSObject {
NSArray *plugins;
}
-+ (WCPluginDatabase *)installedPlugins;
-- (WCPlugin *)getPluginForMimeType:(NSString *)mimeType;
-- (WCPlugin *)getPluginForExtension:(NSString *)extension;
-- (WCPlugin *)getPluginForFilename:(NSString *)filename;
++ (IFPluginDatabase *)installedPlugins;
+- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType;
+- (IFPlugin *)getPluginForExtension:(NSString *)extension;
+- (IFPlugin *)getPluginForFilename:(NSString *)filename;
- (NSArray *) allHandledMIMETypes;
- (NSArray *) plugins;
diff --git a/WebCore/kwq/WCPluginDatabase.mm b/WebKit/Plugins.subproj/IFPluginDatabase.m
similarity index 86%
copy from WebCore/kwq/WCPluginDatabase.mm
copy to WebKit/Plugins.subproj/IFPluginDatabase.m
index 44bc789..c79532c 100644
--- a/WebCore/kwq/WCPluginDatabase.mm
+++ b/WebKit/Plugins.subproj/IFPluginDatabase.m
@@ -23,27 +23,27 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WCPluginDatabase.h"
-#include "kwqdebug.h"
+#import "IFPluginDatabase.h"
+#import "WebKitDebug.h"
- at implementation WCPluginDatabase
-static WCPluginDatabase *__WCPluginDatabase = nil;
+ at implementation IFPluginDatabase
+static IFPluginDatabase *__IFPluginDatabase = nil;
-+ (WCPluginDatabase *)installedPlugins
++ (IFPluginDatabase *)installedPlugins
{
- if(!__WCPluginDatabase){
- __WCPluginDatabase = [WCPluginDatabase alloc];
- __WCPluginDatabase->plugins = findPlugins();
+ if(!__IFPluginDatabase){
+ __IFPluginDatabase = [IFPluginDatabase alloc];
+ __IFPluginDatabase->plugins = findPlugins();
}
- return __WCPluginDatabase;
+ return __IFPluginDatabase;
}
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (WCPlugin *)getPluginForMimeType:(NSString *)mimeType
+- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType
{
uint i, n;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
for(i=0; i<[plugins count]; i++){
@@ -58,10 +58,10 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
return nil;
}
-- (WCPlugin *)getPluginForExtension:(NSString *)extension
+- (IFPlugin *)getPluginForExtension:(NSString *)extension
{
uint i, n;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
NSRange hasExtension;
@@ -78,10 +78,10 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
return nil;
}
-- (WCPlugin *)getPluginForFilename:(NSString *)filename
+- (IFPlugin *)getPluginForFilename:(NSString *)filename
{
uint i;
- WCPlugin *plugin;
+ IFPlugin *plugin;
for(i=0; i<[plugins count]; i++){
plugin = [plugins objectAtIndex:i];
@@ -100,7 +100,7 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
- (NSArray *) allHandledMIMETypes
{
NSMutableArray *allHandledMIMETypes;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
uint i, n;
@@ -144,7 +144,7 @@ NSArray *findPlugins(void)
NSArray *pluginDirectories, *files;
NSString *file;
NSMutableArray *pluginPaths, *pluginArray, *filenames;
- WCPlugin *plugin;
+ IFPlugin *plugin;
uint i, n;
pluginDirectories = pluginLocations();
@@ -166,12 +166,12 @@ NSArray *findPlugins(void)
pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
for(i=0; i<[pluginPaths count]; i++){
- plugin = [WCPlugin alloc];
+ plugin = [IFPlugin alloc];
if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- KWQDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
- KWQDEBUG("%s", [[plugin description] lossyCString]);
+ WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
+ WEBKITDEBUG("%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebKit/Plugins.subproj/IFPluginView.h b/WebKit/Plugins.subproj/IFPluginView.h
index 8f5dfe7..79aa50c 100644
--- a/WebKit/Plugins.subproj/IFPluginView.h
+++ b/WebKit/Plugins.subproj/IFPluginView.h
@@ -8,12 +8,12 @@
@class IFPluginNullEventSender;
@class IFWebDataSource;
- at class WCPlugin;
+ at class IFPlugin;
@protocol IFWebController;
@interface IFPluginView : NSView
{
- WCPlugin *plugin;
+ IFPlugin *plugin;
IFPluginNullEventSender *eventSender;
unsigned argsCount;
char **cAttributes, **cValues;
@@ -48,7 +48,7 @@
NPP_SetValueProcPtr NPP_SetValue;
}
-- initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
+- initWithFrame:(NSRect)r plugin:(IFPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
-(void)drawRect:(NSRect)rect;
-(void)setWindow;
-(void)viewHasMoved:(NSNotification *)notification;
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 5c34323..a2af5ed 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -14,16 +14,14 @@
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
-#import <WCPluginWidget.h>
-#import <WCJavaAppletWidget.h>
-#import <WCPluginDatabase.h>
+#import <IFPluginDatabase.h>
#import <WebFoundation/IFURLHandle.h>
#import <IFPluginStream.h>
#import <IFWebDataSource.h>
#import <WebFoundation/IFError.h>
#import <WebKitDebug.h>
-#import <WCPlugin.h>
+#import <IFPlugin.h>
#import <qwidget.h>
#import <IFWebView.h>
#import <IFBaseWebController.h>
@@ -52,7 +50,7 @@ newCString(NSString *string)
return cString;
}
-- initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
+- initWithFrame:(NSRect)r plugin:(IFPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
{
NSString *baseURLString;
@@ -743,72 +741,6 @@ newCString(NSString *string)
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "forceRedraw\n");
}
-#pragma mark PREBINDING
-
-static NSView *IFPluginViewCreate(NSString *pluginURL, NSString *serviceType, NSArray *args, NSString *baseURL)
-{
- NSMutableDictionary *arguments;
- NSString *mimeType;
- NSRange r1, r2, r3;
- WCPlugin *plugin;
- uint i;
-
- arguments = [NSMutableDictionary dictionary];
- for (i = 0; i < [args count]; i++){
- NSString *arg = [args objectAtIndex:i];
- if ([arg rangeOfString:@"__KHTML__"].length == 0) {
- r1 = [arg rangeOfString:@"="]; // parse out attributes and values
- r2 = [arg rangeOfString:@"\""];
- r3.location = r2.location + 1;
- r3.length = [arg length] - r2.location - 2; // don't include quotes
- [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
- }
- }
-
- if ([baseURL length]) {
- [arguments setObject:baseURL forKey:@"WebKitBaseURL"];
- }
-
- if ([serviceType length]) {
- mimeType = serviceType;
- plugin = [[WCPluginDatabase installedPlugins] getPluginForMimeType:mimeType];
- } else {
- plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[pluginURL pathExtension]];
- mimeType = [plugin mimeTypeForURL:pluginURL];
- }
-
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL mime:mimeType arguments:arguments mode:NP_EMBED] autorelease];
-}
-
-static NSView *IFJavaAppletViewCreate(NSDictionary *arguments)
-{
- WCPlugin *plugin;
- NSMutableDictionary *argsCopy;
-
- plugin = [[WCPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
- if (plugin == nil) {
- return nil;
- }
-
- argsCopy = [NSMutableDictionary dictionaryWithDictionary:arguments];
- [argsCopy setObject:[argsCopy objectForKey:@"baseURL"] forKey:@"DOCBASE"];
- [argsCopy removeObjectForKey:@"baseURL"];
-
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:@"application/x-java-applet" arguments:argsCopy] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:nil mime:@"application/x-java-applet" arguments:argsCopy mode:NP_EMBED] autorelease];
-}
-
-+(void) load
-{
- IFSetPluginViewCreationFunction(IFPluginViewCreate);
- IFSetJavaAppletViewCreationFunction(IFJavaAppletViewCreate);
-}
-
@end
NSString* startupVolumeName(void)
diff --git a/WebCore/kwq/WCPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
similarity index 95%
rename from WebCore/kwq/WCPlugin.h
rename to WebKit/Plugins.subproj/WebPlugin.h
index a0b3536..cbd3ed3 100644
--- a/WebCore/kwq/WCPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -24,9 +24,11 @@
*/
#import <Foundation/Foundation.h>
-#include "npapi.h"
+#import "npapi.h"
+#import <WebCoreViewFactory.h>
- at interface WCPlugin : NSObject {
+ at interface IFPlugin : NSObject <WebCorePluginInfo>
+{
NSMutableArray *mimeTypes;
NSString *name, *path, *filename, *pluginDescription;
BOOL isLoaded, isBundle, isCFM;
@@ -58,13 +60,9 @@
- (void)load;
- (void)unload;
- (NSString *)mimeTypeForURL:(NSString *)URL;
-- (NSArray *)mimeTypes;
-- (NSString *)name;
-- (NSString *)filename;
- (NSString *)path;
- (BOOL)isLoaded;
- (NSString *)description;
-- (NSString *)pluginDescription;
- (NPP_NewProcPtr)NPP_New;
- (NPP_DestroyProcPtr)NPP_Destroy;
diff --git a/WebCore/kwq/WCPlugin.mm b/WebKit/Plugins.subproj/WebPlugin.m
similarity index 95%
rename from WebCore/kwq/WCPlugin.mm
rename to WebKit/Plugins.subproj/WebPlugin.m
index 0863e12..bf1ddbe 100644
--- a/WebCore/kwq/WCPlugin.mm
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -23,11 +23,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WCPlugin.h"
-#include "kwqdebug.h"
+#import "IFPlugin.h"
+#import "WebKitDebug.h"
- at implementation WCPlugin
+ at implementation IFPlugin
- (BOOL)initializeWithPath:(NSString *)pluginPath
{
@@ -45,12 +45,12 @@
if([[fileInfo objectForKey:@"NSFileHFSTypeCode"] unsignedLongValue] == 1112690764){ // 1112690764 = 'BRPL'
err = FSPathMakeRef((UInt8 *)[pluginPath cString], &fref, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: FSPathMakeRef failed. Error=%d\n", err);
return FALSE;
}
resRef = FSOpenResFile(&fref, fsRdPerm);
if(resRef <= noErr){
- KWQDEBUG("WCPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
+ WEBKITDEBUG("IFPlugin: FSOpenResFile failed. Can't open resource file: %s, Error=%d\n", [pluginPath lossyCString], err);
return FALSE;
}
[self getPluginInfoForResourceFile:resRef];
@@ -174,17 +174,17 @@
}else{ // single CFM file
err = FSPathMakeRef((UInt8 *)[path cString], &fref, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: FSPathMakeRef failed. Error=%d\n", err);
return;
}
err = FSGetCatalogInfo(&fref, kFSCatInfoNone, NULL, NULL, &spec, NULL);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: FSGetCatalogInfo failed. Error=%d\n", err);
return;
}
err = GetDiskFragment(&spec, 0, kCFragGoesToEOF, nil, kPrivateCFragCopy, &connID, (Ptr *)&pluginMainFunc, nil);
if(err != noErr){
- KWQDEBUG("WCPlugin: load: GetDiskFragment failed. Error=%d\n", err);
+ WEBKITDEBUG("IFPlugin: load: GetDiskFragment failed. Error=%d\n", err);
return;
}
pluginMainFunc = (mainFuncPtr)functionPointerForTVector((TransitionVector)pluginMainFunc);
@@ -219,7 +219,7 @@
pluginSize = pluginFuncs.size;
pluginVersion = pluginFuncs.version;
- KWQDEBUG("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
+ WEBKITDEBUG("pluginMainFunc: %d, size=%d, version=%d\n", npErr, pluginSize, pluginVersion);
NPP_New = (NPP_NewProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.newp);
NPP_Destroy = (NPP_DestroyProcPtr)functionPointerForTVector((TransitionVector)pluginFuncs.destroy);
@@ -279,7 +279,7 @@
NPP_GetValue = pluginFuncs.getvalue;
NPP_SetValue = pluginFuncs.setvalue;
}
- KWQDEBUG("Plugin Loaded\n");
+ WEBKITDEBUG("Plugin Loaded\n");
isLoaded = TRUE;
}
@@ -292,7 +292,7 @@
}else{
CloseConnection(&connID);
}
- KWQDEBUG("Plugin Unloaded\n");
+ WEBKITDEBUG("Plugin Unloaded\n");
isLoaded = FALSE;
}
diff --git a/WebCore/kwq/WCPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
similarity index 83%
rename from WebCore/kwq/WCPluginDatabase.h
rename to WebKit/Plugins.subproj/WebPluginDatabase.h
index 3255d0b..54851c9 100644
--- a/WebCore/kwq/WCPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -24,16 +24,16 @@
*/
#import <Foundation/Foundation.h>
-#import <WCPlugin.h>
+#import <IFPlugin.h>
- at interface WCPluginDatabase : NSObject {
+ at interface IFPluginDatabase : NSObject {
NSArray *plugins;
}
-+ (WCPluginDatabase *)installedPlugins;
-- (WCPlugin *)getPluginForMimeType:(NSString *)mimeType;
-- (WCPlugin *)getPluginForExtension:(NSString *)extension;
-- (WCPlugin *)getPluginForFilename:(NSString *)filename;
++ (IFPluginDatabase *)installedPlugins;
+- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType;
+- (IFPlugin *)getPluginForExtension:(NSString *)extension;
+- (IFPlugin *)getPluginForFilename:(NSString *)filename;
- (NSArray *) allHandledMIMETypes;
- (NSArray *) plugins;
diff --git a/WebCore/kwq/WCPluginDatabase.mm b/WebKit/Plugins.subproj/WebPluginDatabase.m
similarity index 86%
rename from WebCore/kwq/WCPluginDatabase.mm
rename to WebKit/Plugins.subproj/WebPluginDatabase.m
index 44bc789..c79532c 100644
--- a/WebCore/kwq/WCPluginDatabase.mm
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -23,27 +23,27 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "WCPluginDatabase.h"
-#include "kwqdebug.h"
+#import "IFPluginDatabase.h"
+#import "WebKitDebug.h"
- at implementation WCPluginDatabase
-static WCPluginDatabase *__WCPluginDatabase = nil;
+ at implementation IFPluginDatabase
+static IFPluginDatabase *__IFPluginDatabase = nil;
-+ (WCPluginDatabase *)installedPlugins
++ (IFPluginDatabase *)installedPlugins
{
- if(!__WCPluginDatabase){
- __WCPluginDatabase = [WCPluginDatabase alloc];
- __WCPluginDatabase->plugins = findPlugins();
+ if(!__IFPluginDatabase){
+ __IFPluginDatabase = [IFPluginDatabase alloc];
+ __IFPluginDatabase->plugins = findPlugins();
}
- return __WCPluginDatabase;
+ return __IFPluginDatabase;
}
// The first plugin with the specified mime type is returned. We may want to tie this to the defaults so that this is configurable.
-- (WCPlugin *)getPluginForMimeType:(NSString *)mimeType
+- (IFPlugin *)getPluginForMimeType:(NSString *)mimeType
{
uint i, n;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
for(i=0; i<[plugins count]; i++){
@@ -58,10 +58,10 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
return nil;
}
-- (WCPlugin *)getPluginForExtension:(NSString *)extension
+- (IFPlugin *)getPluginForExtension:(NSString *)extension
{
uint i, n;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
NSRange hasExtension;
@@ -78,10 +78,10 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
return nil;
}
-- (WCPlugin *)getPluginForFilename:(NSString *)filename
+- (IFPlugin *)getPluginForFilename:(NSString *)filename
{
uint i;
- WCPlugin *plugin;
+ IFPlugin *plugin;
for(i=0; i<[plugins count]; i++){
plugin = [plugins objectAtIndex:i];
@@ -100,7 +100,7 @@ static WCPluginDatabase *__WCPluginDatabase = nil;
- (NSArray *) allHandledMIMETypes
{
NSMutableArray *allHandledMIMETypes;
- WCPlugin *plugin;
+ IFPlugin *plugin;
NSArray *mimeArray;
uint i, n;
@@ -144,7 +144,7 @@ NSArray *findPlugins(void)
NSArray *pluginDirectories, *files;
NSString *file;
NSMutableArray *pluginPaths, *pluginArray, *filenames;
- WCPlugin *plugin;
+ IFPlugin *plugin;
uint i, n;
pluginDirectories = pluginLocations();
@@ -166,12 +166,12 @@ NSArray *findPlugins(void)
pluginArray = [NSMutableArray arrayWithCapacity:[pluginPaths count]];
for(i=0; i<[pluginPaths count]; i++){
- plugin = [WCPlugin alloc];
+ plugin = [IFPlugin alloc];
if([plugin initializeWithPath:[pluginPaths objectAtIndex:i]]){
[plugin retain];
[pluginArray addObject:plugin];
- KWQDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
- KWQDEBUG("%s", [[plugin description] lossyCString]);
+ WEBKITDEBUG("Found plugin: %s\n", [[plugin name] lossyCString]);
+ WEBKITDEBUG("%s", [[plugin description] lossyCString]);
}
}
return [pluginArray retain];
diff --git a/WebKit/Plugins.subproj/WebPluginView.h b/WebKit/Plugins.subproj/WebPluginView.h
index 8f5dfe7..79aa50c 100644
--- a/WebKit/Plugins.subproj/WebPluginView.h
+++ b/WebKit/Plugins.subproj/WebPluginView.h
@@ -8,12 +8,12 @@
@class IFPluginNullEventSender;
@class IFWebDataSource;
- at class WCPlugin;
+ at class IFPlugin;
@protocol IFWebController;
@interface IFPluginView : NSView
{
- WCPlugin *plugin;
+ IFPlugin *plugin;
IFPluginNullEventSender *eventSender;
unsigned argsCount;
char **cAttributes, **cValues;
@@ -48,7 +48,7 @@
NPP_SetValueProcPtr NPP_SetValue;
}
-- initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
+- initWithFrame:(NSRect)r plugin:(IFPlugin *)plug url:(NSString *)location mime:(NSString *)mime arguments:(NSDictionary *)arguments mode:(uint16)mode;
-(void)drawRect:(NSRect)rect;
-(void)setWindow;
-(void)viewHasMoved:(NSNotification *)notification;
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 5c34323..a2af5ed 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -14,16 +14,14 @@
#import <AppKit/NSWindow_Private.h>
#import <Carbon/Carbon.h>
-#import <WCPluginWidget.h>
-#import <WCJavaAppletWidget.h>
-#import <WCPluginDatabase.h>
+#import <IFPluginDatabase.h>
#import <WebFoundation/IFURLHandle.h>
#import <IFPluginStream.h>
#import <IFWebDataSource.h>
#import <WebFoundation/IFError.h>
#import <WebKitDebug.h>
-#import <WCPlugin.h>
+#import <IFPlugin.h>
#import <qwidget.h>
#import <IFWebView.h>
#import <IFBaseWebController.h>
@@ -52,7 +50,7 @@ newCString(NSString *string)
return cString;
}
-- initWithFrame:(NSRect)r plugin:(WCPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
+- initWithFrame:(NSRect)r plugin:(IFPlugin *)plug url:(NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments mode:(uint16)mode
{
NSString *baseURLString;
@@ -743,72 +741,6 @@ newCString(NSString *string)
WEBKITDEBUGLEVEL(WEBKIT_LOG_PLUGINS, "forceRedraw\n");
}
-#pragma mark PREBINDING
-
-static NSView *IFPluginViewCreate(NSString *pluginURL, NSString *serviceType, NSArray *args, NSString *baseURL)
-{
- NSMutableDictionary *arguments;
- NSString *mimeType;
- NSRange r1, r2, r3;
- WCPlugin *plugin;
- uint i;
-
- arguments = [NSMutableDictionary dictionary];
- for (i = 0; i < [args count]; i++){
- NSString *arg = [args objectAtIndex:i];
- if ([arg rangeOfString:@"__KHTML__"].length == 0) {
- r1 = [arg rangeOfString:@"="]; // parse out attributes and values
- r2 = [arg rangeOfString:@"\""];
- r3.location = r2.location + 1;
- r3.length = [arg length] - r2.location - 2; // don't include quotes
- [arguments setObject:[arg substringWithRange:r3] forKey:[arg substringToIndex:r1.location]];
- }
- }
-
- if ([baseURL length]) {
- [arguments setObject:baseURL forKey:@"WebKitBaseURL"];
- }
-
- if ([serviceType length]) {
- mimeType = serviceType;
- plugin = [[WCPluginDatabase installedPlugins] getPluginForMimeType:mimeType];
- } else {
- plugin = [[WCPluginDatabase installedPlugins] getPluginForExtension:[pluginURL pathExtension]];
- mimeType = [plugin mimeTypeForURL:pluginURL];
- }
-
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:mimeType arguments:arguments] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:pluginURL mime:mimeType arguments:arguments mode:NP_EMBED] autorelease];
-}
-
-static NSView *IFJavaAppletViewCreate(NSDictionary *arguments)
-{
- WCPlugin *plugin;
- NSMutableDictionary *argsCopy;
-
- plugin = [[WCPluginDatabase installedPlugins] getPluginForFilename:@"Java.plugin"];
- if (plugin == nil) {
- return nil;
- }
-
- argsCopy = [NSMutableDictionary dictionaryWithDictionary:arguments];
- [argsCopy setObject:[argsCopy objectForKey:@"baseURL"] forKey:@"DOCBASE"];
- [argsCopy removeObjectForKey:@"baseURL"];
-
- if (plugin == nil) {
- return [[[IFNullPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) mimeType:@"application/x-java-applet" arguments:argsCopy] autorelease];
- }
- return [[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) plugin:plugin url:nil mime:@"application/x-java-applet" arguments:argsCopy mode:NP_EMBED] autorelease];
-}
-
-+(void) load
-{
- IFSetPluginViewCreationFunction(IFPluginViewCreate);
- IFSetJavaAppletViewCreationFunction(IFJavaAppletViewCreate);
-}
-
@end
NSString* startupVolumeName(void)
diff --git a/WebCore/kwq/npapi.h b/WebKit/Plugins.subproj/npapi.h
similarity index 99%
rename from WebCore/kwq/npapi.h
rename to WebKit/Plugins.subproj/npapi.h
index 9a1eed4..82fadf7 100644
--- a/WebCore/kwq/npapi.h
+++ b/WebKit/Plugins.subproj/npapi.h
@@ -26,8 +26,8 @@
#ifndef _NPAPI_H_
#define _NPAPI_H_
-#include <CoreServices/CoreServices.h>
-#include <Foundation/Foundation.h>
+#import <CoreServices/CoreServices.h>
+#import <Foundation/Foundation.h>
/*
* Values for mode passed to NPP_New:
*/
diff --git a/WebCore/kwq/npapi.mm b/WebKit/Plugins.subproj/npapi.m
similarity index 96%
rename from WebCore/kwq/npapi.mm
rename to WebKit/Plugins.subproj/npapi.m
index 0fa47ac..8747428 100644
--- a/WebCore/kwq/npapi.mm
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -23,8 +23,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "npapi.h"
-#include "kwqdebug.h"
+#import "npapi.h"
+#import "WebKitDebug.h"
@interface IFPluginView : NSObject
-(NPError)getURLNotify:(const char *)url target:(const char *)target notifyData:(void *)notifyData;
@@ -47,33 +47,33 @@
const char* NPN_UserAgent(NPP instance)
{
- KWQDEBUG("NPN_UserAgent\n");
+ WEBKITDEBUG("NPN_UserAgent\n");
return "IE";
}
void* NPN_MemAlloc(UInt32 size)
{
- //KWQDEBUG("NPN_MemAlloc\n");
+ //WEBKITDEBUG("NPN_MemAlloc\n");
return malloc(size);
}
void NPN_MemFree(void* ptr)
{
- //KWQDEBUG("NPN_MemFree\n");
+ //WEBKITDEBUG("NPN_MemFree\n");
free(ptr);
}
UInt32 NPN_MemFlush(UInt32 size)
{
- KWQDEBUG("NPN_MemFlush\n");
+ WEBKITDEBUG("NPN_MemFlush\n");
return 0;
}
void NPN_ReloadPlugins(NPBool reloadPages)
{
- KWQDEBUG("NPN_ReloadPlugins\n");
+ WEBKITDEBUG("NPN_ReloadPlugins\n");
}
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h b/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
similarity index 80%
copy from WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
copy to WebKit/WebCoreSupport.subproj/IFTextRenderer.h
index 3e57909..374c169 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.h
@@ -1,17 +1,17 @@
//
-// IFCachedTextRenderer.h
+// IFTextRenderer.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <IFTextRenderer.h>
+#import <WebCoreTextRenderer.h>
#import <QD/ATSUnicodePriv.h>
typedef float IFGlyphWidth;
- at interface IFCachedTextRenderer : NSObject <IFTextRenderer>
+ at interface IFTextRenderer : NSObject <WebCoreTextRenderer>
{
NSFont *font;
int ascent;
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
similarity index 99%
copy from WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
copy to WebKit/WebCoreSupport.subproj/IFTextRenderer.m
index d9efb6e..9d30a23 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRenderer.m
@@ -1,12 +1,12 @@
//
-// IFCachedTextRenderer.m
+// IFTextRenderer.m
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFCachedTextRenderer.h"
+#import "IFTextRenderer.h"
#import <Cocoa/Cocoa.h>
@@ -145,7 +145,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
}
}
- at implementation IFCachedTextRenderer
+ at implementation IFTextRenderer
- (void)initializeCaches
{
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
similarity index 62%
copy from WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h
copy to WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
index f73be04..c10736a 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.h
@@ -1,14 +1,14 @@
//
-// IFCachedTextRendererFactory.h
+// IFTextRendererFactory.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <IFTextRendererFactory.h>
+#import <WebCoreTextRendererFactory.h>
- at interface IFCachedTextRendererFactory : IFTextRendererFactory
+ at interface IFTextRendererFactory : WebCoreTextRendererFactory
{
NSMutableDictionary *cache;
}
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m
similarity index 83%
copy from WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
copy to WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m
index e034e5d..31bc57e 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/IFTextRendererFactory.m
@@ -1,13 +1,13 @@
//
-// IFCachedTextRendererFactory.m
+// IFTextRendererFactory.m
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFCachedTextRendererFactory.h>
-#import <WebKit/IFCachedTextRenderer.h>
+#import <WebKit/IFTextRendererFactory.h>
+#import <WebKit/IFTextRenderer.h>
#import <WebKit/WebKitDebug.h>
@interface IFFontCacheKey : NSObject
@@ -59,14 +59,14 @@
@end
- at implementation IFCachedTextRendererFactory
+ at implementation IFTextRendererFactory
+ (void)createSharedFactory;
{
- if (![IFTextRendererFactory sharedFactory]) {
- [[[IFCachedTextRendererFactory alloc] init] release];
+ if (![self sharedFactory]) {
+ [[[self alloc] init] release];
}
- WEBKIT_ASSERT([[IFTextRendererFactory sharedFactory] isMemberOfClass:[IFCachedTextRendererFactory class]]);
+ WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
}
- init
@@ -85,11 +85,11 @@
[super dealloc];
}
-- (id <IFTextRenderer>)rendererWithFont:(NSFont *)font
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font
{
- IFCachedTextRenderer *renderer = [cache objectForKey:font];
+ IFTextRenderer *renderer = [cache objectForKey:font];
if (renderer == nil) {
- renderer = [[IFCachedTextRenderer alloc] initWithFont:font];
+ renderer = [[IFTextRenderer alloc] initWithFont:font];
[cache setObject:renderer forKey:font];
[renderer release];
}
@@ -151,7 +151,7 @@
return font;
}
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
{
return [self rendererWithFont:[self cachedFontWithFamily:family traits:traits size:size]];
}
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
similarity index 80%
rename from WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
rename to WebKit/WebCoreSupport.subproj/WebTextRenderer.h
index 3e57909..374c169 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.h
@@ -1,17 +1,17 @@
//
-// IFCachedTextRenderer.h
+// IFTextRenderer.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <IFTextRenderer.h>
+#import <WebCoreTextRenderer.h>
#import <QD/ATSUnicodePriv.h>
typedef float IFGlyphWidth;
- at interface IFCachedTextRenderer : NSObject <IFTextRenderer>
+ at interface IFTextRenderer : NSObject <WebCoreTextRenderer>
{
NSFont *font;
int ascent;
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
similarity index 99%
rename from WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
rename to WebKit/WebCoreSupport.subproj/WebTextRenderer.m
index d9efb6e..9d30a23 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRenderer.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRenderer.m
@@ -1,12 +1,12 @@
//
-// IFCachedTextRenderer.m
+// IFTextRenderer.m
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import "IFCachedTextRenderer.h"
+#import "IFTextRenderer.h"
#import <Cocoa/Cocoa.h>
@@ -145,7 +145,7 @@ static void ConvertCharactersToGlyphs(ATSStyleGroupPtr styleGroup, const UniChar
}
}
- at implementation IFCachedTextRenderer
+ at implementation IFTextRenderer
- (void)initializeCaches
{
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
similarity index 62%
rename from WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h
rename to WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
index f73be04..c10736a 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.h
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.h
@@ -1,14 +1,14 @@
//
-// IFCachedTextRendererFactory.h
+// IFTextRendererFactory.h
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <IFTextRendererFactory.h>
+#import <WebCoreTextRendererFactory.h>
- at interface IFCachedTextRendererFactory : IFTextRendererFactory
+ at interface IFTextRendererFactory : WebCoreTextRendererFactory
{
NSMutableDictionary *cache;
}
diff --git a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
similarity index 83%
rename from WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
rename to WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
index e034e5d..31bc57e 100644
--- a/WebKit/WebCoreSupport.subproj/IFCachedTextRendererFactory.m
+++ b/WebKit/WebCoreSupport.subproj/WebTextRendererFactory.m
@@ -1,13 +1,13 @@
//
-// IFCachedTextRendererFactory.m
+// IFTextRendererFactory.m
// WebKit
//
// Created by Darin Adler on Thu May 02 2002.
// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
//
-#import <WebKit/IFCachedTextRendererFactory.h>
-#import <WebKit/IFCachedTextRenderer.h>
+#import <WebKit/IFTextRendererFactory.h>
+#import <WebKit/IFTextRenderer.h>
#import <WebKit/WebKitDebug.h>
@interface IFFontCacheKey : NSObject
@@ -59,14 +59,14 @@
@end
- at implementation IFCachedTextRendererFactory
+ at implementation IFTextRendererFactory
+ (void)createSharedFactory;
{
- if (![IFTextRendererFactory sharedFactory]) {
- [[[IFCachedTextRendererFactory alloc] init] release];
+ if (![self sharedFactory]) {
+ [[[self alloc] init] release];
}
- WEBKIT_ASSERT([[IFTextRendererFactory sharedFactory] isMemberOfClass:[IFCachedTextRendererFactory class]]);
+ WEBKIT_ASSERT([[self sharedFactory] isMemberOfClass:self]);
}
- init
@@ -85,11 +85,11 @@
[super dealloc];
}
-- (id <IFTextRenderer>)rendererWithFont:(NSFont *)font
+- (id <WebCoreTextRenderer>)rendererWithFont:(NSFont *)font
{
- IFCachedTextRenderer *renderer = [cache objectForKey:font];
+ IFTextRenderer *renderer = [cache objectForKey:font];
if (renderer == nil) {
- renderer = [[IFCachedTextRenderer alloc] initWithFont:font];
+ renderer = [[IFTextRenderer alloc] initWithFont:font];
[cache setObject:renderer forKey:font];
[renderer release];
}
@@ -151,7 +151,7 @@
return font;
}
-- (id <IFTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
+- (id <WebCoreTextRenderer>)rendererWithFamily:(NSString *)family traits:(NSFontTraitMask)traits size:(float)size
{
return [self rendererWithFont:[self cachedFontWithFamily:family traits:traits size:size]];
}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 3f43944..1d6cf87 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -227,9 +227,13 @@
F5065226027F557E01C1A526,
F5065228027F557E01C1A526,
F5B36B430281DF55018635CB,
- F5B36B470281DF9C018635CB,
F50AD3880282028B01C1A526,
F5C283740284676D018635CA,
+ F5F717240288493C018635CA,
+ F5F717260288493C018635CA,
+ F5F717280288493C018635CA,
+ F5F71748028855C5018635CA,
+ F5F7174E02885C5B018635CA,
);
isa = PBXHeadersBuildPhase;
};
@@ -284,6 +288,10 @@
F5065229027F557E01C1A526,
F5B36B440281DF55018635CB,
F5B36B480281DF9C018635CB,
+ F5F717250288493C018635CA,
+ F5F717270288493C018635CA,
+ F5F717290288493C018635CA,
+ F5F7174F02885C5B018635CA,
);
isa = PBXSourcesBuildPhase;
};
@@ -1459,6 +1467,8 @@
F5B36B460281DF9C018635CB,
F5B36B410281DF55018635CB,
F5B36B420281DF55018635CB,
+ F5F7174C02885C5B018635CA,
+ F5F7174D02885C5B018635CA,
);
isa = PBXGroup;
name = "WebCore Support";
@@ -1466,14 +1476,14 @@
};
F5B36B410281DF55018635CB = {
isa = PBXFileReference;
- name = IFCachedTextRenderer.h;
- path = WebCoreSupport.subproj/IFCachedTextRenderer.h;
+ name = IFTextRenderer.h;
+ path = WebCoreSupport.subproj/IFTextRenderer.h;
refType = 4;
};
F5B36B420281DF55018635CB = {
isa = PBXFileReference;
- name = IFCachedTextRenderer.m;
- path = WebCoreSupport.subproj/IFCachedTextRenderer.m;
+ name = IFTextRenderer.m;
+ path = WebCoreSupport.subproj/IFTextRenderer.m;
refType = 4;
};
F5B36B430281DF55018635CB = {
@@ -1490,22 +1500,16 @@
};
F5B36B450281DF9C018635CB = {
isa = PBXFileReference;
- name = IFCachedTextRendererFactory.h;
- path = WebCoreSupport.subproj/IFCachedTextRendererFactory.h;
+ name = IFTextRendererFactory.h;
+ path = WebCoreSupport.subproj/IFTextRendererFactory.h;
refType = 4;
};
F5B36B460281DF9C018635CB = {
isa = PBXFileReference;
- name = IFCachedTextRendererFactory.m;
- path = WebCoreSupport.subproj/IFCachedTextRendererFactory.m;
+ name = IFTextRendererFactory.m;
+ path = WebCoreSupport.subproj/IFTextRendererFactory.m;
refType = 4;
};
- F5B36B470281DF9C018635CB = {
- fileRef = F5B36B450281DF9C018635CB;
- isa = PBXBuildFile;
- settings = {
- };
- };
F5B36B480281DF9C018635CB = {
fileRef = F5B36B460281DF9C018635CB;
isa = PBXBuildFile;
@@ -1651,6 +1655,12 @@
F5A672B80263866E01000102,
F5A672B90263866E01000102,
F5A672BA0263866E01000102,
+ F5F7171E0288493C018635CA,
+ F5F7171F0288493C018635CA,
+ F5F717200288493C018635CA,
+ F5F717210288493C018635CA,
+ F5F717220288493C018635CA,
+ F5F717230288493C018635CA,
);
isa = PBXGroup;
name = Plugins;
@@ -1747,6 +1757,106 @@
settings = {
};
};
+ F5F7171E0288493C018635CA = {
+ isa = PBXFileReference;
+ name = IFPlugin.h;
+ path = Plugins.subproj/IFPlugin.h;
+ refType = 4;
+ };
+ F5F7171F0288493C018635CA = {
+ isa = PBXFileReference;
+ name = IFPlugin.m;
+ path = Plugins.subproj/IFPlugin.m;
+ refType = 4;
+ };
+ F5F717200288493C018635CA = {
+ isa = PBXFileReference;
+ name = IFPluginDatabase.h;
+ path = Plugins.subproj/IFPluginDatabase.h;
+ refType = 4;
+ };
+ F5F717210288493C018635CA = {
+ isa = PBXFileReference;
+ name = IFPluginDatabase.m;
+ path = Plugins.subproj/IFPluginDatabase.m;
+ refType = 4;
+ };
+ F5F717220288493C018635CA = {
+ isa = PBXFileReference;
+ name = npapi.h;
+ path = Plugins.subproj/npapi.h;
+ refType = 4;
+ };
+ F5F717230288493C018635CA = {
+ isa = PBXFileReference;
+ name = npapi.m;
+ path = Plugins.subproj/npapi.m;
+ refType = 4;
+ };
+ F5F717240288493C018635CA = {
+ fileRef = F5F7171E0288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F717250288493C018635CA = {
+ fileRef = F5F7171F0288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F717260288493C018635CA = {
+ fileRef = F5F717200288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F717270288493C018635CA = {
+ fileRef = F5F717210288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F717280288493C018635CA = {
+ fileRef = F5F717220288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F717290288493C018635CA = {
+ fileRef = F5F717230288493C018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F71748028855C5018635CA = {
+ fileRef = F5B36B450281DF9C018635CB;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F7174C02885C5B018635CA = {
+ isa = PBXFileReference;
+ path = IFWebCoreViewFactory.h;
+ refType = 4;
+ };
+ F5F7174D02885C5B018635CA = {
+ isa = PBXFileReference;
+ path = IFWebCoreViewFactory.m;
+ refType = 4;
+ };
+ F5F7174E02885C5B018635CA = {
+ fileRef = F5F7174C02885C5B018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ F5F7174F02885C5B018635CA = {
+ fileRef = F5F7174D02885C5B018635CA;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
};
rootObject = 0867D690FE84028FC02AAC07;
}
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 6cf0893..cf1262d 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -8,7 +8,8 @@
#import <WebKit/IFBaseWebController.h>
#import <WebKit/IFDynamicScrollBarsView.h>
#import <WebKit/IFException.h>
-#import <WebKit/IFCachedTextRendererFactory.h>
+#import <WebKit/IFWebCoreViewFactory.h>
+#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
// KDE related includes
@@ -25,7 +26,8 @@
{
[super initWithFrame: frame];
- [IFCachedTextRendererFactory createSharedFactory];
+ [IFWebCoreViewFactory createSharedFactory];
+ [IFTextRendererFactory createSharedFactory];
_private = [[IFWebViewPrivate alloc] init];
@@ -265,7 +267,7 @@
- delayLayout: sender
{
[NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(delayLayout:) object: self];
- KWQDEBUG("KWQHTMLView: delayLayout called\n");
+ WEBKITDEBUG("KWQHTMLView: delayLayout called\n");
[self setNeedsLayout: YES];
[self setNeedsDisplay: YES];
}
@@ -273,7 +275,7 @@
-(void)notificationReceived:(NSNotification *)notification
{
if ([[notification name] rangeOfString: @"uri-fin-"].location == 0){
- KWQDEBUG1("KWQHTMLView: Received notification, %s\n", DEBUG_OBJECT([notification name]));
+ WEBKITDEBUG1("KWQHTMLView: Received notification, %s\n", DEBUG_OBJECT([notification name]));
[self performSelector:@selector(delayLayout:) withObject:self afterDelay:(NSTimeInterval)0.5];
}
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 6cf0893..cf1262d 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -8,7 +8,8 @@
#import <WebKit/IFBaseWebController.h>
#import <WebKit/IFDynamicScrollBarsView.h>
#import <WebKit/IFException.h>
-#import <WebKit/IFCachedTextRendererFactory.h>
+#import <WebKit/IFWebCoreViewFactory.h>
+#import <WebKit/IFTextRendererFactory.h>
#import <WebKit/WebKitDebug.h>
// KDE related includes
@@ -25,7 +26,8 @@
{
[super initWithFrame: frame];
- [IFCachedTextRendererFactory createSharedFactory];
+ [IFWebCoreViewFactory createSharedFactory];
+ [IFTextRendererFactory createSharedFactory];
_private = [[IFWebViewPrivate alloc] init];
@@ -265,7 +267,7 @@
- delayLayout: sender
{
[NSObject cancelPreviousPerformRequestsWithTarget: self selector: @selector(delayLayout:) object: self];
- KWQDEBUG("KWQHTMLView: delayLayout called\n");
+ WEBKITDEBUG("KWQHTMLView: delayLayout called\n");
[self setNeedsLayout: YES];
[self setNeedsDisplay: YES];
}
@@ -273,7 +275,7 @@
-(void)notificationReceived:(NSNotification *)notification
{
if ([[notification name] rangeOfString: @"uri-fin-"].location == 0){
- KWQDEBUG1("KWQHTMLView: Received notification, %s\n", DEBUG_OBJECT([notification name]));
+ WEBKITDEBUG1("KWQHTMLView: Received notification, %s\n", DEBUG_OBJECT([notification name]));
[self performSelector:@selector(delayLayout:) withObject:self afterDelay:(NSTimeInterval)0.5];
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list