[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jberlin at webkit.org
jberlin at webkit.org
Wed Dec 22 13:08:27 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 75d69a9b3274cec680836e1e39b8232be51e6b10
Author: jberlin at webkit.org <jberlin at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 7 19:21:33 2010 +0000
2010-09-07 Jessie Berlin <jberlin at apple.com>
Unreviewed. Mac build fix.
* MiniBrowser/mac/WebBundle/WebBundleMain.m:
(didClearWindowObjectForFrame):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66898 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index eba5a70..f7ef7fe 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,12 @@
2010-09-07 Jessie Berlin <jberlin at apple.com>
+ Unreviewed. Mac build fix.
+
+ * MiniBrowser/mac/WebBundle/WebBundleMain.m:
+ (didClearWindowObjectForFrame):
+
+2010-09-07 Jessie Berlin <jberlin at apple.com>
+
Reviewed by Darin Adler.
Indicate which one of the ScriptWorlds for a Frame the Window Object has been cleared for
diff --git a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
index 17958c7..1fffce6 100644
--- a/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
+++ b/WebKitTools/MiniBrowser/mac/WebBundle/WebBundleMain.m
@@ -37,7 +37,7 @@ static WKBundleRef globalBundle;
// WKBundlePageClient functions
-void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame, JSGlobalContextRef context, JSObjectRef window, const void *clientInfo)
+void didClearWindowObjectForFrame(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleScriptWorldRef world, const void *clientInfo)
{
WKURLRef wkURL = WKBundleFrameCopyURL(WKBundlePageGetMainFrame(page));
CFURLRef cfURL = WKURLCopyCFURL(0, wkURL);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list