Changeset 148547 in webkit

Timestamp:

Apr 16, 2013 3:01:38 PM (11 years ago)

Author:

dino@apple.com

Message:

PlugIns that resize in user gestures should be immune to snapshotting
​https://bugs.webkit.org/show_bug.cgi?id=114697
<rdar://problem/13666258>

Reviewed by Tim Horton.

Now that we snapshot plugins if they resize above the snapshotting threshold,
we need to make sure that we don't do it in response to a user gesture
such as a click.

Due to the complexities of real-world content and the way they often do
things using timeout, I copied the code from the generic user gesture
timeout, which gives a 5 second grace period after clicks.

• html/HTMLPlugInImageElement.cpp:

(WebCore::documentHadRecentUserGesture): New static function to share the code for

checking the time since the last click (or whatever).

(WebCore::HTMLPlugInImageElement::checkSizeChangeForSnapshotting): Make sure

to test for a user gesture.

(WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Move the

code into the new function.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLPlugInImageElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-16  Dean Jackson  <dino@apple.com>
+
+        PlugIns that resize in user gestures should be immune to snapshotting
+        https://bugs.webkit.org/show_bug.cgi?id=114697
+        <rdar://problem/13666258>
+
+        Reviewed by Tim Horton.
+
+        Now that we snapshot plugins if they resize above the snapshotting threshold,
+        we need to make sure that we don't do it in response to a user gesture
+        such as a click.
+
+        Due to the complexities of real-world content and the way they often do
+        things using timeout, I copied the code from the generic user gesture
+        timeout, which gives a 5 second grace period after clicks.
+
+        * html/HTMLPlugInImageElement.cpp:
+        (WebCore::documentHadRecentUserGesture): New static function to share the code for
+            checking the time since the last click (or whatever).
+        (WebCore::HTMLPlugInImageElement::checkSizeChangeForSnapshotting): Make sure
+            to test for a user gesture.
+        (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Move the
+            code into the new function.
+
 2013-04-15  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp

@@ -539 +539 @@
 }
 
+static bool documentHadRecentUserGesture(Document* document)
+{
+    double lastKnownUserGestureTimestamp = document->lastHandledUserGestureTimestamp();
+
+    if (document->frame() != document->page()->mainFrame() && document->page()->mainFrame() && document->page()->mainFrame()->document())
+        lastKnownUserGestureTimestamp = std::max(lastKnownUserGestureTimestamp, document->page()->mainFrame()->document()->lastHandledUserGestureTimestamp());
+
+    if (currentTime() - lastKnownUserGestureTimestamp < autostartSoonAfterUserGestureThreshold)
+        return true;
+
+    return false;
+}
+
 void HTMLPlugInImageElement::checkSizeChangeForSnapshotting()
 {
-    if (!m_needsCheckForSizeChange || m_snapshotDecision != MaySnapshotWhenResized)
+    if (!m_needsCheckForSizeChange || m_snapshotDecision != MaySnapshotWhenResized || documentHadRecentUserGesture(document()))
         return;
 
@@ -610 +623 @@
     }
 
-    double lastKnownUserGestureTimestamp = document()->lastHandledUserGestureTimestamp();
-    if (!inMainFrame && document()->page()->mainFrame() && document()->page()->mainFrame()->document())
-        lastKnownUserGestureTimestamp = std::max(lastKnownUserGestureTimestamp, document()->page()->mainFrame()->document()->lastHandledUserGestureTimestamp());
-    if (currentTime() - lastKnownUserGestureTimestamp < autostartSoonAfterUserGestureThreshold) {
+    if (documentHadRecentUserGesture(document())) {
         LOG(Plugins, "%p Plug-in was created shortly after a user gesture, set to play", this);
         m_snapshotDecision = NeverSnapshot;