Changeset 140081 in webkit

Timestamp:

Jan 17, 2013 6:09:21 PM (11 years ago)

Author:

jonlee@apple.com

Message:

Do not track user interaction for plugins that are not snapshotted
​https://bugs.webkit.org/show_bug.cgi?id=107211
<rdar://problem/12967277>

Reviewed by Dean Jackson.

When the user interacts with a snapshotted plug-in, we extend that plug-in origin's
expiration date. However, plug-ins may not be snapshotted for other reasons than the
user's initial opt-in. In this case, that plug-in's origin might be not be in the cached
table. This is an edge case that was not initially considered.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::plugInDidReceiveUserInteraction): Convert the assertion to an if
check, and return early if the entry is not found in the cache table.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-17  Jon Lee  <jonlee@apple.com>
+
+        Do not track user interaction for plugins that are not snapshotted
+        https://bugs.webkit.org/show_bug.cgi?id=107211
+        <rdar://problem/12967277>
+
+        Reviewed by Dean Jackson.
+
+        When the user interacts with a snapshotted plug-in, we extend that plug-in origin's
+        expiration date. However, plug-ins may not be snapshotted for other reasons than the
+        user's initial opt-in. In this case, that plug-in's origin might be not be in the cached
+        table. This is an edge case that was not initially considered.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::plugInDidReceiveUserInteraction): Convert the assertion to an if
+        check, and return early if the entry is not found in the cache table.
+
 2013-01-17  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -817 +817 @@
 
     HashMap<unsigned, double>::iterator it = m_plugInAutoStartOrigins.find(plugInOriginHash);
-    ASSERT(it != m_plugInAutoStartOrigins.end());
+    if (it == m_plugInAutoStartOrigins.end())
+        return;
     if (it->value - currentTime() > plugInAutoStartExpirationTimeUpdateThreshold)
         return;