diff options
| author | Iain Merrick <husky@google.com> | 2010-08-20 12:03:17 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-08-23 17:37:03 +0100 |
| commit | e3235d1e747128c0e8ad4d2164a9cfde6c873409 (patch) | |
| tree | 5d316c7406fb9b2135d07049ecf86aff7cdf4813 /WebKit | |
| parent | ae5906648f058ec4bad470ea6c49672d6f87273c (diff) | |
| download | external_webkit-e3235d1e747128c0e8ad4d2164a9cfde6c873409.zip external_webkit-e3235d1e747128c0e8ad4d2164a9cfde6c873409.tar.gz external_webkit-e3235d1e747128c0e8ad4d2164a9cfde6c873409.tar.bz2 | |
Merge WebKit at r65615 : processingUserGesture() is now static.
See http://trac.webkit.org/changeset/65082
Change-Id: I268dfe7d9ab60453129f00b00cdd5f8ac954855c
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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()); |