[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eroman at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 60fdb2e4a33636e712cfacc47f97bb5c3fea7f5f
Author: eroman at chromium.org <eroman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 12 05:50:17 2009 +0000

    Unreviewed build fix.
    
            [V8] Add a method on ScriptController to get it compiling after http://trac.webkit.org/changeset/52033.
    
            * bindings/v8/ScriptController.cpp:
            (WebCore::ScriptController::anyPageIsProcessingUserGesture):
            * bindings/v8/ScriptController.h:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52043 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3bbcf44..46bfcf1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-11  Eric Roman  <eroman at chromium.org>
+
+        Unreviewed build fix.
+
+        [V8] Add a method on ScriptController to get it compiling after http://trac.webkit.org/changeset/52033.
+
+        * bindings/v8/ScriptController.cpp:
+        (WebCore::ScriptController::anyPageIsProcessingUserGesture):
+        * bindings/v8/ScriptController.h:
+
 2009-12-11  Geoffrey Garen  <ggaren at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebCore/bindings/v8/ScriptController.cpp b/WebCore/bindings/v8/ScriptController.cpp
index eb07abb..cdb18e6 100644
--- a/WebCore/bindings/v8/ScriptController.cpp
+++ b/WebCore/bindings/v8/ScriptController.cpp
@@ -195,6 +195,12 @@ bool ScriptController::processingUserGesture() const
     return false;
 }
 
+bool ScriptController::anyPageIsProcessingUserGesture() const
+{
+    // FIXME: is this right?
+    return processingUserGesture();
+}
+
 void ScriptController::evaluateInIsolatedWorld(unsigned worldID, const Vector<ScriptSourceCode>& sources)
 {
     m_proxy->evaluateInIsolatedWorld(worldID, sources, 0);
diff --git a/WebCore/bindings/v8/ScriptController.h b/WebCore/bindings/v8/ScriptController.h
index fb7bbee..298ffe0 100644
--- a/WebCore/bindings/v8/ScriptController.h
+++ b/WebCore/bindings/v8/ScriptController.h
@@ -148,6 +148,7 @@ namespace WebCore {
 
         void setProcessingTimerCallback(bool processingTimerCallback) { m_processingTimerCallback = processingTimerCallback; }
         bool processingUserGesture() const;
+        bool anyPageIsProcessingUserGesture() const;
 
         void setPaused(bool paused) { m_paused = paused; }
         bool isPaused() const { return m_paused; }

-- 
WebKit Debian packaging