Title: [140081] trunk/Source/WebKit2
- Revision
- 140081
- Author
- jon...@apple.com
- Date
- 2013-01-17 18:09:21 -0800 (Thu, 17 Jan 2013)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (140080 => 140081)
--- trunk/Source/WebKit2/ChangeLog 2013-01-18 02:06:07 UTC (rev 140080)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-18 02:09:21 UTC (rev 140081)
@@ -1,3 +1,20 @@
+2013-01-17 Jon Lee <jon...@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 <a...@apple.com>
REGRESSION (r139516): NetworkResourceLoadScheduler::receivedRedirect is not called.
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (140080 => 140081)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-18 02:06:07 UTC (rev 140080)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2013-01-18 02:09:21 UTC (rev 140081)
@@ -816,7 +816,8 @@
return;
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
