From e3235d1e747128c0e8ad4d2164a9cfde6c873409 Mon Sep 17 00:00:00 2001
From: Iain Merrick <husky@google.com>
Date: Fri, 20 Aug 2010 12:03:17 +0100
Subject: Merge WebKit at r65615 : processingUserGesture() is now static.

See http://trac.webkit.org/changeset/65082

Change-Id: I268dfe7d9ab60453129f00b00cdd5f8ac954855c
---
 WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp')

diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index ec1390e..d5cadad 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -163,7 +163,7 @@ Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&,
     if (features.fullscreen)
         dialog = false;
     WebCore::Frame* newFrame = m_webFrame->createWindow(dialog,
-            frame->script()->processingUserGesture(mainThreadNormalWorld()));
+            ScriptController::processingUserGesture());
     if (newFrame) {
         WebCore::Page* page = newFrame->page();
         page->setGroupName(frame->page()->groupName());
-- 
cgit v1.1