[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
abarth at webkit.org
abarth at webkit.org
Thu Oct 29 20:31:44 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 272b0ba84d13ec78bc60a16c11cbe790ffa32d09
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Sep 22 05:25:58 2009 +0000
2009-09-21 Adam Barth <abarth at webkit.org>
Attempted fix for the V8 build.
* bindings/v8/custom/V8DOMWindowCustom.cpp:
(WebCore::V8Custom::WindowSetTimeoutImpl):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48620 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c4b58f..3ad9eb6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,12 @@
2009-09-21 Adam Barth <abarth at webkit.org>
+ Attempted fix for the V8 build.
+
+ * bindings/v8/custom/V8DOMWindowCustom.cpp:
+ (WebCore::V8Custom::WindowSetTimeoutImpl):
+
+2009-09-21 Adam Barth <abarth at webkit.org>
+
Reviewed by Sam Weinig.
Don't re-enter JavaScript after performing access checks
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index a4a7f9a..5fd667e 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -72,10 +72,6 @@ v8::Handle<v8::Value> V8Custom::WindowSetTimeoutImpl(const v8::Arguments& args,
functionString = function->IsString() ?
toWebCoreString(function) : toWebCoreString(function->ToString());
- // Bail out if string conversion failed.
- if (functionString.IsEmpty())
- return v8::Undefined();
-
// Don't allow setting timeouts to run empty functions!
// (Bug 1009597)
if (functionString.length() == 0)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list