[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
aa at chromium.org
aa at chromium.org
Thu Dec 3 13:36:50 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit e827bd4e937f2254ac891f564055104b92c8435a
Author: aa at chromium.org <aa at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 14 02:58:50 2009 +0000
2009-11-13 Aaron Boodman <aa at chromium.org>
Unreviewed fix to Chromium build.
* bindings/v8/ScriptController.cpp:
(WebCore::ScriptController::getAllWorlds):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50990 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5830e20..51dd2d0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2009-11-13 Aaron Boodman <aa at chromium.org>
+ Unreviewed fix to Chromium build.
+
+ * bindings/v8/ScriptController.cpp:
+ (WebCore::ScriptController::getAllWorlds):
+
+2009-11-13 Aaron Boodman <aa at chromium.org>
+
Unreviewed fix for Chromium build.
* platform/text/TextBoundaries.cpp: Use longer path to refer to Unicode.h.
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 7bd29b1..d1c6ff2 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -351,7 +351,7 @@ void ScriptController::cleanupScriptObjectsForPlugin(Widget* nativeHandle)
void ScriptController::getAllWorlds(Vector<DOMWrapperWorld*>& worlds)
{
- worlds.append(mainThreadWorld());
+ worlds.append(mainThreadNormalWorld());
}
static NPObject* createNoScriptObject()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list