[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

commit-queue at webkit.org commit-queue at webkit.org
Mon Feb 21 00:37:10 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit de6c2ec0865555214f9da5c75bb2e1b30c05e456
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 08:13:41 2011 +0000

    2011-02-02  Chris Evans  <cevans at chromium.org>
    
            Reviewed by Adam Barth.
    
            [Chromium] Propagate the accurate gesture status when calling into FrameLoader
            https://bugs.webkit.org/show_bug.cgi?id=53571
    
            * src/WebPluginContainerImpl.cpp:
            (WebKit::WebPluginContainerImpl::loadFrameRequest): FrameLoader might decide the target is a new window, so make such the UserGestureIndicator is fully accurate before calling into it.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77367 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index dffa8f4..3f738cd 100644
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-02  Chris Evans  <cevans at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [Chromium] Propagate the accurate gesture status when calling into FrameLoader
+        https://bugs.webkit.org/show_bug.cgi?id=53571
+
+        * src/WebPluginContainerImpl.cpp:
+        (WebKit::WebPluginContainerImpl::loadFrameRequest): FrameLoader might decide the target is a new window, so make such the UserGestureIndicator is fully accurate before calling into it.
+
 2011-02-01  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp b/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
index 5f62077..37b6f76 100644
--- a/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -69,6 +69,7 @@
 #include "Page.h"
 #include "RenderBox.h"
 #include "ScrollView.h"
+#include "UserGestureIndicator.h"
 #include "WheelEvent.h"
 
 #if WEBKIT_USING_SKIA
@@ -368,6 +369,9 @@ void WebPluginContainerImpl::loadFrameRequest(
     FrameLoadRequest frameRequest(frame->document()->securityOrigin(),
         request.toResourceRequest(), target);
 
+    UserGestureIndicator gestureIndicator(request.hasUserGesture() ?
+        DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
+
     frame->loader()->loadFrameRequest(
         frameRequest,
         false,  // lock history

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list