[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hamaji at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 464154c3791a9898a87478b8aa4587dc6fe56bdf
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 04:13:58 2010 +0000

    2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
    
            [Chromium] Unreviewed attempt to fix the chromium build.
    
            Corresponding change: http://trac.webkit.org/changeset/54182
    
            * bindings/scripts/CodeGeneratorV8.pm:
            * bindings/v8/ScriptController.cpp:
            (WebCore::ScriptController::processingUserGesture):
            * bindings/v8/ScriptController.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54196 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 073c210..71cf73c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        [Chromium] Unreviewed attempt to fix the chromium build.
+
+        Corresponding change: http://trac.webkit.org/changeset/54182
+
+        * bindings/scripts/CodeGeneratorV8.pm:
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::processingUserGesture):
+        * bindings/v8/ScriptController.h:
+
 2010-02-01  Dmitry Titov  <dimich at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index a1f5f2f..59ffffc 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -2190,6 +2190,14 @@ sub GenerateFunctionCallString()
         if ($first) { $first = 0; }
     }
 
+    if ($function->signature->extendedAttributes->{"NeedsUserGestureCheck"}) {
+        $functionString .= ", " if not $first;
+        # FIXME: We need to pass DOMWrapperWorld as a parameter.
+        # See http://trac.webkit.org/changeset/54182
+        $functionString .= "processingUserGesture()";
+        if ($first) { $first = 0; }
+    }
+
     if (@{$function->raisesExceptions}) {
         $functionString .= ", " if not $first;
         $functionString .= "ec";
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index 89ff9fa..608221b 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -148,7 +148,7 @@ void ScriptController::updatePlatformScriptObjects()
     notImplemented();
 }
 
-bool ScriptController::processingUserGesture() const
+bool ScriptController::processingUserGesture(DOMWrapperWorld*) const
 {
     Frame* activeFrame = V8Proxy::retrieveFrameForEnteredContext();
     // No script is running, so it must be run by users.
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index a361b39..b3995b2 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -143,7 +143,9 @@ public:
     void setEventHandlerLineNumber(int lineNumber);
 
     void setProcessingTimerCallback(bool processingTimerCallback) { m_processingTimerCallback = processingTimerCallback; }
-    bool processingUserGesture() const;
+    // FIXME: Currently we don't use the parameter world at all.
+    // See http://trac.webkit.org/changeset/54182
+    bool processingUserGesture(DOMWrapperWorld* world = 0) const;
     bool anyPageIsProcessingUserGesture() const;
 
     void setPaused(bool paused) { m_paused = paused; }

-- 
WebKit Debian packaging