- Revision
- 160940
- Author
- commit-qu...@webkit.org
- Date
- 2013-12-20 15:56:38 -0800 (Fri, 20 Dec 2013)
Log Message
Rename PlugInAutoStartProvider's ...EntriesAddedBeforeTime facility to ...EntriesAddedAfterTime
https://bugs.webkit.org/show_bug.cgi?id=126078
Patch by Ricky Mondello <rmonde...@apple.com> on 2013-12-20
Reviewed by Anders Carlsson.
r160922 accidentally named a facility for filtering out data added after a certain time,
"...FilteringOutEntriesAddedBeforeTime", which was incorrect. This patch renames those instances
to "...FilteringOutEntriesAddedAfterTime".
* UIProcess/API/C/WKContext.cpp:
(WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime):
* UIProcess/API/C/WKContext.h:
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
(WebKit::PlugInAutoStartProvider::setAutoStartOriginsFilteringOutEntriesAddedAfterTime):
* UIProcess/Plugins/PlugInAutoStartProvider.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime):
* UIProcess/WebContext.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160939 => 160940)
--- trunk/Source/WebKit2/ChangeLog 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-20 23:56:38 UTC (rev 160940)
@@ -1,3 +1,24 @@
+2013-12-20 Ricky Mondello <rmonde...@apple.com>
+
+ Rename PlugInAutoStartProvider's ...EntriesAddedBeforeTime facility to ...EntriesAddedAfterTime
+ https://bugs.webkit.org/show_bug.cgi?id=126078
+
+ Reviewed by Anders Carlsson.
+
+ r160922 accidentally named a facility for filtering out data added after a certain time,
+ "...FilteringOutEntriesAddedBeforeTime", which was incorrect. This patch renames those instances
+ to "...FilteringOutEntriesAddedAfterTime".
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime):
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+ (WebKit::PlugInAutoStartProvider::setAutoStartOriginsFilteringOutEntriesAddedAfterTime):
+ * UIProcess/Plugins/PlugInAutoStartProvider.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime):
+ * UIProcess/WebContext.h:
+
2013-12-20 Sam Weinig <s...@webkit.org>
[WK2] Add SPI for using a custom protocol handler
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2013-12-20 23:56:38 UTC (rev 160940)
@@ -391,11 +391,11 @@
toImpl(contextRef)->setPlugInAutoStartOriginHashes(*toImpl(dictionaryRef));
}
-void WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedBeforeTime(WKContextRef contextRef, WKDictionaryRef dictionaryRef, double time)
+void WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime(WKContextRef contextRef, WKDictionaryRef dictionaryRef, double time)
{
if (!dictionaryRef)
return;
- toImpl(contextRef)->setPlugInAutoStartOriginsFilteringOutEntriesAddedBeforeTime(*toImpl(dictionaryRef), time);
+ toImpl(contextRef)->setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime(*toImpl(dictionaryRef), time);
}
void WKContextSetPlugInAutoStartOrigins(WKContextRef contextRef, WKArrayRef arrayRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2013-12-20 23:56:38 UTC (rev 160940)
@@ -139,7 +139,7 @@
WK_EXPORT WKDictionaryRef WKContextCopyPlugInAutoStartOriginHashes(WKContextRef context);
WK_EXPORT void WKContextSetPlugInAutoStartOriginHashes(WKContextRef context, WKDictionaryRef dictionary);
WK_EXPORT void WKContextSetPlugInAutoStartOrigins(WKContextRef contextRef, WKArrayRef arrayRef);
-WK_EXPORT void WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedBeforeTime(WKContextRef contextRef, WKDictionaryRef dictionaryRef, double time);
+WK_EXPORT void WKContextSetPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime(WKContextRef contextRef, WKDictionaryRef dictionaryRef, double time);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-20 23:56:38 UTC (rev 160940)
@@ -106,7 +106,7 @@
});
}
-void PlugInAutoStartProvider::setAutoStartOriginsFilteringOutEntriesAddedBeforeTime(ImmutableDictionary& table, double time)
+void PlugInAutoStartProvider::setAutoStartOriginsFilteringOutEntriesAddedAfterTime(ImmutableDictionary& table, double time)
{
double adjustedTimestamp = time + plugInAutoStartExpirationTimeThreshold;
setAutoStartOriginsTableWithItemsPassingTest(table, [adjustedTimestamp](double expirationTimestamp) {
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2013-12-20 23:56:38 UTC (rev 160940)
@@ -56,7 +56,7 @@
PassRefPtr<ImmutableDictionary> autoStartOriginsTableCopy() const;
void setAutoStartOriginsTable(ImmutableDictionary&);
- void setAutoStartOriginsFilteringOutEntriesAddedBeforeTime(ImmutableDictionary&, double time);
+ void setAutoStartOriginsFilteringOutEntriesAddedAfterTime(ImmutableDictionary&, double time);
void setAutoStartOriginsArray(API::Array&);
PlugInAutoStartOriginHash autoStartOriginHashesCopy() const;
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-20 23:56:38 UTC (rev 160940)
@@ -1279,9 +1279,9 @@
m_plugInAutoStartProvider.setAutoStartOriginsArray(array);
}
-void WebContext::setPlugInAutoStartOriginsFilteringOutEntriesAddedBeforeTime(ImmutableDictionary& dictionary, double time)
+void WebContext::setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime(ImmutableDictionary& dictionary, double time)
{
- m_plugInAutoStartProvider.setAutoStartOriginsFilteringOutEntriesAddedBeforeTime(dictionary, time);
+ m_plugInAutoStartProvider.setAutoStartOriginsFilteringOutEntriesAddedAfterTime(dictionary, time);
}
#if ENABLE(CUSTOM_PROTOCOLS)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (160939 => 160940)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-20 23:55:04 UTC (rev 160939)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-20 23:56:38 UTC (rev 160940)
@@ -262,7 +262,7 @@
PassRefPtr<ImmutableDictionary> plugInAutoStartOriginHashes() const;
void setPlugInAutoStartOriginHashes(ImmutableDictionary&);
void setPlugInAutoStartOrigins(API::Array&);
- void setPlugInAutoStartOriginsFilteringOutEntriesAddedBeforeTime(ImmutableDictionary&, double time);
+ void setPlugInAutoStartOriginsFilteringOutEntriesAddedAfterTime(ImmutableDictionary&, double time);
// Network Process Management