diff options
| author | Steve Block <steveblock@google.com> | 2010-02-10 18:35:38 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-15 10:54:06 +0000 |
| commit | e6dc63f936f844a7d0345323c19b11349214737e (patch) | |
| tree | f6ef70c821a6cf6fde46ec4e81ee580e68ce2bcc | |
| parent | 1267f612f1953a309f53dad9bf7cecefbee193b5 (diff) | |
| download | external_webkit-e6dc63f936f844a7d0345323c19b11349214737e.zip external_webkit-e6dc63f936f844a7d0345323c19b11349214737e.tar.gz external_webkit-e6dc63f936f844a7d0345323c19b11349214737e.tar.bz2 | |
Merge webkit.org at r54340 : Update use of processingUserGesture to pass DOMWrapperWorld
See http://trac.webkit.org/changeset/54182
Change-Id: I71b4de3bbef2963c1332eef229bd23646c3ee23a
| -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 8d4032d..96be4f1 100644 --- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -192,7 +192,7 @@ Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&, if (features.fullscreen) dialog = false; WebCore::Frame* newFrame = m_webFrame->createWindow(dialog, - frame->script()->processingUserGesture()); + frame->script()->processingUserGesture(mainThreadNormalWorld())); if (newFrame) { WebCore::Page* page = newFrame->page(); page->setGroupName(frame->page()->groupName()); |