Commit d3dd007c authored by hamaji@chromium.org's avatar hamaji@chromium.org

2010-02-01 Shinichiro Hamaji <hamaji@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: svn://svn.chromium.org/blink/trunk@54196 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 50f43981
2010-02-01 Shinichiro Hamaji <hamaji@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@chromium.org> 2010-02-01 Dmitry Titov <dimich@chromium.org>
Reviewed by David Levin. Reviewed by David Levin.
......
...@@ -2190,6 +2190,14 @@ sub GenerateFunctionCallString() ...@@ -2190,6 +2190,14 @@ sub GenerateFunctionCallString()
if ($first) { $first = 0; } 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}) { if (@{$function->raisesExceptions}) {
$functionString .= ", " if not $first; $functionString .= ", " if not $first;
$functionString .= "ec"; $functionString .= "ec";
......
...@@ -148,7 +148,7 @@ void ScriptController::updatePlatformScriptObjects() ...@@ -148,7 +148,7 @@ void ScriptController::updatePlatformScriptObjects()
notImplemented(); notImplemented();
} }
bool ScriptController::processingUserGesture() const bool ScriptController::processingUserGesture(DOMWrapperWorld*) const
{ {
Frame* activeFrame = V8Proxy::retrieveFrameForEnteredContext(); Frame* activeFrame = V8Proxy::retrieveFrameForEnteredContext();
// No script is running, so it must be run by users. // No script is running, so it must be run by users.
......
...@@ -143,7 +143,9 @@ public: ...@@ -143,7 +143,9 @@ public:
void setEventHandlerLineNumber(int lineNumber); void setEventHandlerLineNumber(int lineNumber);
void setProcessingTimerCallback(bool processingTimerCallback) { m_processingTimerCallback = processingTimerCallback; } 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; bool anyPageIsProcessingUserGesture() const;
void setPaused(bool paused) { m_paused = paused; } void setPaused(bool paused) { m_paused = paused; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment