[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
mjs
mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:56:10 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b6d81ac434f0cfe21c2a827beb1cd380d13a747a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Feb 23 07:21:41 2002 +0000
WebFoundation:
Fix prebinding:
* WebFoundation.pbproj/project.pbxproj: Set first segment address
to 0x2000000 to avoid colliding with apps. Need to have permanent
value assigned at some point.
WebCore:
Fix prebinding:
* src/Makefile.am: Enable prebinding, set first segment address to
0x2200000 to avoid colliding with apps or our other
frameworks. Change other link flags to support prebinding.
Set up some hacks to avoid link-time dependency on
WebKit. Prebinding is incompatible with - undefined suppress, so
we can't have WebCore depend on symbols provided by WebKit any
more:
* src/kwq/KWQKHTMLPart.h:
* src/kwq/KWQKloader.mm: (WCSetIFLoadProgressMakeFunc), (-[URLLoadClient
WCURLHandleResourceDidFinishLoading:data:userData:]), (-[URLLoadClient
WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
* src/kwq/WCPluginWidget.h:
* src/kwq/WCPluginWidget.mm: (WCSetIFPluginMakeFunc),
(WCPluginWidget::WCPluginWidget):
WebKit:
Fix prebinding:
* WebKit.pbproj/project.pbxproj: Set first segment address
0x4000000 to avoid colliding with apps or our other frameworks.
Set up some hacks to avoid link-time dependency on
WebKit. Prebinding is incompatible with - undefined suppress, so
we can't have WebCore depend on symbols provided by WebKit any
more:
* Plugins.subproj/IFPluginView.mm: (IFPluginMake), (+[IFPluginView load]),
(startupVolumeName):
* WebView.subproj/IFBaseWebController.mm: (IFLoadProgressMake), (+[IFLoadProgress
load]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@664 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 598383c..feb43f7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,24 @@
+2002-02-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fix prebinding:
+
+ * src/Makefile.am: Enable prebinding, set first segment address to
+ 0x2200000 to avoid colliding with apps or our other
+ frameworks. Change other link flags to support prebinding.
+
+ Set up some hacks to avoid link-time dependency on
+ WebKit. Prebinding is incompatible with - undefined suppress, so
+ we can't have WebCore depend on symbols provided by WebKit any
+ more:
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKloader.mm: (WCSetIFLoadProgressMakeFunc), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget):
+
2002-02-22 Richard Williamson <rjw at apple.com>
Added data: to IFURLHandleResourceDidFinishLoading:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 598383c..feb43f7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,24 @@
+2002-02-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fix prebinding:
+
+ * src/Makefile.am: Enable prebinding, set first segment address to
+ 0x2200000 to avoid colliding with apps or our other
+ frameworks. Change other link flags to support prebinding.
+
+ Set up some hacks to avoid link-time dependency on
+ WebKit. Prebinding is incompatible with - undefined suppress, so
+ we can't have WebCore depend on symbols provided by WebKit any
+ more:
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKloader.mm: (WCSetIFLoadProgressMakeFunc), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget):
+
2002-02-22 Richard Williamson <rjw at apple.com>
Added data: to IFURLHandleResourceDidFinishLoading:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 598383c..feb43f7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,24 @@
+2002-02-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fix prebinding:
+
+ * src/Makefile.am: Enable prebinding, set first segment address to
+ 0x2200000 to avoid colliding with apps or our other
+ frameworks. Change other link flags to support prebinding.
+
+ Set up some hacks to avoid link-time dependency on
+ WebKit. Prebinding is incompatible with - undefined suppress, so
+ we can't have WebCore depend on symbols provided by WebKit any
+ more:
+
+ * src/kwq/KWQKHTMLPart.h:
+ * src/kwq/KWQKloader.mm: (WCSetIFLoadProgressMakeFunc), (-[URLLoadClient
+ WCURLHandleResourceDidFinishLoading:data:userData:]), (-[URLLoadClient
+ WCURLHandle:resourceDataDidBecomeAvailable:userData:]):
+ * src/kwq/WCPluginWidget.h:
+ * src/kwq/WCPluginWidget.mm: (WCSetIFPluginMakeFunc),
+ (WCPluginWidget::WCPluginWidget):
+
2002-02-22 Richard Williamson <rjw at apple.com>
Added data: to IFURLHandleResourceDidFinishLoading:
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 39eaa01..4084ace 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -30,6 +30,7 @@
#include <loader.h>
#include <WCURLHandle.h>
+#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
#define MAXCACHEABLE 40*1024
@@ -58,6 +59,16 @@
using namespace khtml;
using namespace DOM;
+
+static WCIFLoadProgressMakeFunc WCIFLoadProgressMake;
+
+void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
+{
+ WCIFLoadProgressMake = func;
+}
+
+
+
void CachedObject::finish()
{
if( m_size > MAXCACHEABLE )
@@ -988,7 +999,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [data length];
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
@@ -1008,7 +1019,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = -1;
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 39eaa01..4084ace 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -30,6 +30,7 @@
#include <loader.h>
#include <WCURLHandle.h>
+#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
#define MAXCACHEABLE 40*1024
@@ -58,6 +59,16 @@
using namespace khtml;
using namespace DOM;
+
+static WCIFLoadProgressMakeFunc WCIFLoadProgressMake;
+
+void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
+{
+ WCIFLoadProgressMake = func;
+}
+
+
+
void CachedObject::finish()
{
if( m_size > MAXCACHEABLE )
@@ -988,7 +999,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [data length];
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
@@ -1008,7 +1019,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = -1;
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 39eaa01..4084ace 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -30,6 +30,7 @@
#include <loader.h>
#include <WCURLHandle.h>
+#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
#define MAXCACHEABLE 40*1024
@@ -58,6 +59,16 @@
using namespace khtml;
using namespace DOM;
+
+static WCIFLoadProgressMakeFunc WCIFLoadProgressMake;
+
+void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
+{
+ WCIFLoadProgressMake = func;
+}
+
+
+
void CachedObject::finish()
{
if( m_size > MAXCACHEABLE )
@@ -988,7 +999,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [data length];
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
@@ -1008,7 +1019,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = -1;
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/kwq/WCPluginWidget.h b/WebCore/kwq/WCPluginWidget.h
index 39ed29c..28f4700 100644
--- a/WebCore/kwq/WCPluginWidget.h
+++ b/WebCore/kwq/WCPluginWidget.h
@@ -33,6 +33,10 @@
#include "qwidget.h"
#include "qstring.h"
#import <WCPlugin.h>
+
+
+typedef id (*WCIFPluginMakeFunc)(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments);
+void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func);
// class WCPluginWidget ===============================================================
diff --git a/WebCore/kwq/WCPluginWidget.mm b/WebCore/kwq/WCPluginWidget.mm
index ce88a90..f2ef8eb 100644
--- a/WebCore/kwq/WCPluginWidget.mm
+++ b/WebCore/kwq/WCPluginWidget.mm
@@ -34,6 +34,14 @@
@end
+static WCIFPluginMakeFunc WCIFPluginMake = NULL;
+
+void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
+{
+ WCIFPluginMake = func;
+}
+
+
WCPluginWidget::WCPluginWidget(QWidget *parent, const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
@@ -66,7 +74,7 @@ WCPluginWidget::WCPluginWidget(QWidget *parent, const QString &url, const QStrin
return;
}
[plugin load];
- setView([[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this plugin:plugin url:QSTRING_TO_NSSTRING(url) mime:mimeType arguments:arguments] autorelease]);
+ setView(WCIFPluginMake(NSMakeRect(0,0,0,0), this, plugin, QSTRING_TO_NSSTRING(url), mimeType, arguments));
}
WCPluginWidget::~WCPluginWidget()
diff --git a/WebCore/src/Makefile.am b/WebCore/src/Makefile.am
index da1c4d0..1b3b970 100644
--- a/WebCore/src/Makefile.am
+++ b/WebCore/src/Makefile.am
@@ -29,9 +29,15 @@ LIBWEBCORE_INSTALL_PATH=$(symrootsdir)
endif
LDFLAGS = \
+ -framework Cocoa \
+ -framework CoreFoundation \
+ -F$(symrootsdir) -framework WebFoundation \
-dynamiclib \
- -flat_namespace -undefined suppress \
+ -twolevel_namespace \
+ -prebind \
+ -undefined error \
-all_load \
+ -seg1addr 0x2200000 \
-install_name $(LIBWEBCORE_INSTALL_PATH)/libwebcore.dylib \
$(NULL)
diff --git a/WebCore/src/kwq/KWQKHTMLPart.h b/WebCore/src/kwq/KWQKHTMLPart.h
index c77387a..9da67ae 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.h
+++ b/WebCore/src/kwq/KWQKHTMLPart.h
@@ -622,4 +622,5 @@ private:
#endif
};
+
#endif
diff --git a/WebCore/src/kwq/KWQKloader.mm b/WebCore/src/kwq/KWQKloader.mm
index 39eaa01..4084ace 100644
--- a/WebCore/src/kwq/KWQKloader.mm
+++ b/WebCore/src/kwq/KWQKloader.mm
@@ -30,6 +30,7 @@
#include <loader.h>
#include <WCURLHandle.h>
+#include <WCLoadProgress.h>
// up to which size is a picture for sure cacheable
#define MAXCACHEABLE 40*1024
@@ -58,6 +59,16 @@
using namespace khtml;
using namespace DOM;
+
+static WCIFLoadProgressMakeFunc WCIFLoadProgressMake;
+
+void WCSetIFLoadProgressMakeFunc(WCIFLoadProgressMakeFunc func)
+{
+ WCIFLoadProgressMake = func;
+}
+
+
+
void CachedObject::finish()
{
if( m_size > MAXCACHEABLE )
@@ -988,7 +999,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = [data length];
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
@@ -1008,7 +1019,7 @@ typedef enum {
id <IFLoadHandler> controller;
controller = [m_dataSource controller];
- IFLoadProgress *loadProgress = [[[IFLoadProgress alloc] init] autorelease];
+ IFLoadProgress *loadProgress = WCIFLoadProgressMake();
loadProgress->totalToLoad = -1;
loadProgress->bytesSoFar = [data length];
[controller receivedProgress: (IFLoadProgress *)loadProgress forResource: QSTRING_TO_NSSTRING(urlString) fromDataSource: m_dataSource];
diff --git a/WebCore/src/kwq/WCPluginWidget.h b/WebCore/src/kwq/WCPluginWidget.h
index 39ed29c..28f4700 100644
--- a/WebCore/src/kwq/WCPluginWidget.h
+++ b/WebCore/src/kwq/WCPluginWidget.h
@@ -33,6 +33,10 @@
#include "qwidget.h"
#include "qstring.h"
#import <WCPlugin.h>
+
+
+typedef id (*WCIFPluginMakeFunc)(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments);
+void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func);
// class WCPluginWidget ===============================================================
diff --git a/WebCore/src/kwq/WCPluginWidget.mm b/WebCore/src/kwq/WCPluginWidget.mm
index ce88a90..f2ef8eb 100644
--- a/WebCore/src/kwq/WCPluginWidget.mm
+++ b/WebCore/src/kwq/WCPluginWidget.mm
@@ -34,6 +34,14 @@
@end
+static WCIFPluginMakeFunc WCIFPluginMake = NULL;
+
+void WCSetIFPluginMakeFunc(WCIFPluginMakeFunc func)
+{
+ WCIFPluginMake = func;
+}
+
+
WCPluginWidget::WCPluginWidget(QWidget *parent, const QString &url, const QString &serviceType, const QStringList &args)
{
NSMutableDictionary *arguments;
@@ -66,7 +74,7 @@ WCPluginWidget::WCPluginWidget(QWidget *parent, const QString &url, const QStrin
return;
}
[plugin load];
- setView([[[IFPluginView alloc] initWithFrame:NSMakeRect(0,0,0,0) widget:this plugin:plugin url:QSTRING_TO_NSSTRING(url) mime:mimeType arguments:arguments] autorelease]);
+ setView(WCIFPluginMake(NSMakeRect(0,0,0,0), this, plugin, QSTRING_TO_NSSTRING(url), mimeType, arguments));
}
WCPluginWidget::~WCPluginWidget()
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index a4b2423..b56a1a4 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,20 @@
+2002-02-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fix prebinding:
+
+ * WebKit.pbproj/project.pbxproj: Set first segment address
+ 0x4000000 to avoid colliding with apps or our other frameworks.
+
+ Set up some hacks to avoid link-time dependency on
+ WebKit. Prebinding is incompatible with - undefined suppress, so
+ we can't have WebCore depend on symbols provided by WebKit any
+ more:
+
+ * Plugins.subproj/IFPluginView.mm: (IFPluginMake), (+[IFPluginView load]),
+ (startupVolumeName):
+ * WebView.subproj/IFBaseWebController.mm: (IFLoadProgressMake), (+[IFLoadProgress
+ load]):
+
2002-02-22 John Sullivan <sullivan at apple.com>
Updated for modified NSCalendarDate extensions API.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index a4b2423..b56a1a4 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,20 @@
+2002-02-22 Maciej Stachowiak <mjs at apple.com>
+
+ Fix prebinding:
+
+ * WebKit.pbproj/project.pbxproj: Set first segment address
+ 0x4000000 to avoid colliding with apps or our other frameworks.
+
+ Set up some hacks to avoid link-time dependency on
+ WebKit. Prebinding is incompatible with - undefined suppress, so
+ we can't have WebCore depend on symbols provided by WebKit any
+ more:
+
+ * Plugins.subproj/IFPluginView.mm: (IFPluginMake), (+[IFPluginView load]),
+ (startupVolumeName):
+ * WebView.subproj/IFBaseWebController.mm: (IFLoadProgressMake), (+[IFLoadProgress
+ load]):
+
2002-02-22 John Sullivan <sullivan at apple.com>
Updated for modified NSCalendarDate extensions API.
diff --git a/WebKit/Plugins.subproj/IFPluginView.mm b/WebKit/Plugins.subproj/IFPluginView.mm
index 7b3fa5b..f193b87 100644
--- a/WebKit/Plugins.subproj/IFPluginView.mm
+++ b/WebKit/Plugins.subproj/IFPluginView.mm
@@ -12,6 +12,7 @@
#include <WCURLHandle.h>
#import <IFWebDataSource.h>
#import <IFBaseWebController.h>
+#include <WCPluginWidget.h>
#ifdef __cplusplus
extern "C" {
@@ -61,6 +62,16 @@ extern "C" {
@implementation IFPluginView
+static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments)
+{
+ return [[[IFPluginView alloc] initWithFrame:rect widget:widget plugin:plugin url:url mime:mimeType arguments:arguments] autorelease];
+}
+
++(void) load
+{
+ WCSetIFPluginMakeFunc(IFPluginMake);
+}
+
- initWithFrame: (NSRect) r widget: (QWidget *)w plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
{
NPError npErr;
@@ -632,4 +643,4 @@ NSString* startupVolumeName(void)
}
}
return rootName;
-}
\ No newline at end of file
+}
diff --git a/WebKit/Plugins.subproj/WebPluginView.m b/WebKit/Plugins.subproj/WebPluginView.m
index 7b3fa5b..f193b87 100644
--- a/WebKit/Plugins.subproj/WebPluginView.m
+++ b/WebKit/Plugins.subproj/WebPluginView.m
@@ -12,6 +12,7 @@
#include <WCURLHandle.h>
#import <IFWebDataSource.h>
#import <IFBaseWebController.h>
+#include <WCPluginWidget.h>
#ifdef __cplusplus
extern "C" {
@@ -61,6 +62,16 @@ extern "C" {
@implementation IFPluginView
+static id IFPluginMake(NSRect rect, QWidget *widget, WCPlugin *plugin, NSString *url, NSString *mimeType, NSDictionary *arguments)
+{
+ return [[[IFPluginView alloc] initWithFrame:rect widget:widget plugin:plugin url:url mime:mimeType arguments:arguments] autorelease];
+}
+
++(void) load
+{
+ WCSetIFPluginMakeFunc(IFPluginMake);
+}
+
- initWithFrame: (NSRect) r widget: (QWidget *)w plugin: (WCPlugin *)plug url: (NSString *)location mime:(NSString *)mimeType arguments:(NSDictionary *)arguments
{
NPError npErr;
@@ -632,4 +643,4 @@ NSString* startupVolumeName(void)
}
}
return rootName;
-}
\ No newline at end of file
+}
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 05091c6..3565adf 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -125,7 +125,7 @@
INSTALL_PATH = "";
LIBRARY_SEARCH_PATHS = "";
OTHER_CFLAGS = "-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DHAVE_CONFIG_H -DQT_NO_DATASTREAM -D_KWQ_ -I.. -I../WebCore/src/kdelibs/khtml -I../WebCore/src/kwq -I../WebCore/src/kwq/kparts -I../WebCore/include -I../WebCore/include/private -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ -F/System/Library/Frameworks/CoreServices.framework/Frameworks/ -F/System/Library/Frameworks/Carbon.framework/Frameworks/";
- OTHER_LDFLAGS = "-lwebcore -framework WebFoundation";
+ OTHER_LDFLAGS = "-lwebcore -framework WebFoundation -seg1addr 0x4000000";
PRODUCT_NAME = WebKit;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index e7601f0..bfc148d 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -11,6 +11,7 @@
#import <WebKit/IFException.h>
#include <KWQKHTMLPart.h>
+#include <WCLoadProgress.h>
#include <rendering/render_frames.h>
@@ -70,6 +71,17 @@
@end
@implementation IFLoadProgress
+
+static id IFLoadProgressMake()
+{
+ return [[[IFLoadProgress alloc] init] autorelease];
+}
+
++(void) load
+{
+ WCSetIFLoadProgressMakeFunc(IFLoadProgressMake);
+}
+
- init
{
return [super init];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list