<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188787] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188787">188787</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-21 15:01:02 -0700 (Fri, 21 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using the old callOnMainThread variant on Windows
https://bugs.webkit.org/show_bug.cgi?id=148332
Reviewed by Tim Horton.
Source/WebCore:
* platform/network/cf/CookieStorageCFNet.cpp:
(WebCore::notifyCookiesChanged):
(WebCore::notifyCookiesChangedOnMainThread): Deleted.
* platform/network/win/NetworkStateNotifierWin.cpp:
(WebCore::NetworkStateNotifier::addrChangeCallback):
Source/WebKit/win:
* Plugins/PluginMainThreadScheduler.cpp:
(WebCore::PluginMainThreadScheduler::scheduleCall):
(WebCore::PluginMainThreadScheduler::mainThreadCallback): Deleted.
* Plugins/PluginMainThreadScheduler.h:
* WebDatabaseManager.cpp:
(DidModifyOriginData::dispatchToMainThread):
* WebIconDatabase.cpp:
(WebIconDatabase::scheduleNotificationDelivery):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkNetworkStateNotifierh">trunk/Source/WebCore/platform/network/NetworkStateNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkwinNetworkStateNotifierWincpp">trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginMainThreadSchedulercpp">trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKitwinPluginsPluginMainThreadSchedulerh">trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h</a></li>
<li><a href="#trunkSourceWebKitwinWebDatabaseManagercpp">trunk/Source/WebKit/win/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebIconDatabasecpp">trunk/Source/WebKit/win/WebIconDatabase.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebCore/ChangeLog 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-08-21 Anders Carlsson <andersca@apple.com>
+
+ Stop using the old callOnMainThread variant on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=148332
+
+ Reviewed by Tim Horton.
+
+ * platform/network/cf/CookieStorageCFNet.cpp:
+ (WebCore::notifyCookiesChanged):
+ (WebCore::notifyCookiesChangedOnMainThread): Deleted.
+ * platform/network/win/NetworkStateNotifierWin.cpp:
+ (WebCore::NetworkStateNotifier::addrChangeCallback):
+
</ins><span class="cx"> 2015-08-20 Matt Rajca <mrajca@apple.com>
</span><span class="cx">
</span><span class="cx"> Media Session: let UI clients change the volume of the focused media element
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkNetworkStateNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebCore/platform/network/NetworkStateNotifier.h 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx">
</span><span class="cx"> #elif PLATFORM(WIN)
</span><span class="cx"> static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut);
</span><del>- static void callAddressChanged(void*);
</del><span class="cx"> void addressChanged();
</span><span class="cx">
</span><span class="cx"> void registerForAddressChange();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieStorageCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -43,15 +43,11 @@
</span><span class="cx">
</span><span class="cx"> static CookieChangeCallbackPtr cookieChangeCallback;
</span><span class="cx">
</span><del>-static void notifyCookiesChangedOnMainThread(void*)
-{
- ASSERT(isMainThread());
- cookieChangeCallback();
-}
-
</del><span class="cx"> static void notifyCookiesChanged(CFHTTPCookieStorageRef, void *)
</span><span class="cx"> {
</span><del>- callOnMainThread(notifyCookiesChangedOnMainThread, 0);
</del><ins>+ callOnMainThread([] {
+ cookieChangeCallback();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline CFRunLoopRef cookieStorageObserverRunLoop()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkwinNetworkStateNotifierWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -87,11 +87,15 @@
</span><span class="cx">
</span><span class="cx"> void CALLBACK NetworkStateNotifier::addrChangeCallback(void* context, BOOLEAN timedOut)
</span><span class="cx"> {
</span><ins>+ NetworkStateNotifier* notifier = static_cast<NetworkStateNotifier*>(context);
+
</ins><span class="cx"> // NotifyAddrChange only notifies us of a single address change. Now that we've been notified,
</span><span class="cx"> // we need to call it again so we'll get notified the *next* time.
</span><del>- static_cast<NetworkStateNotifier*>(context)->registerForAddressChange();
</del><ins>+ notifier->registerForAddressChange();
</ins><span class="cx">
</span><del>- callOnMainThread(callAddressChanged, context);
</del><ins>+ callOnMainThread([notifier] {
+ notifier->addressChanged();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkStateNotifier::registerForAddressChange()
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-21 Anders Carlsson <andersca@apple.com>
+
+ Stop using the old callOnMainThread variant on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=148332
+
+ Reviewed by Tim Horton.
+
+ * Plugins/PluginMainThreadScheduler.cpp:
+ (WebCore::PluginMainThreadScheduler::scheduleCall):
+ (WebCore::PluginMainThreadScheduler::mainThreadCallback): Deleted.
+ * Plugins/PluginMainThreadScheduler.h:
+ * WebDatabaseManager.cpp:
+ (DidModifyOriginData::dispatchToMainThread):
+ * WebIconDatabase.cpp:
+ (WebIconDatabase::scheduleNotificationDelivery):
+
</ins><span class="cx"> 2015-08-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Miscellaneous Windows Cleanups
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginMainThreadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -51,7 +51,9 @@
</span><span class="cx"> it->value.append(Call(function, userData));
</span><span class="cx">
</span><span class="cx"> if (!m_callPending) {
</span><del>- callOnMainThread(mainThreadCallback, this);
</del><ins>+ callOnMainThread([this] {
+ dispatchCalls();
+ });
</ins><span class="cx"> m_callPending = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -102,9 +104,4 @@
</span><span class="cx"> dispatchCallsForPlugin(entry.key, entry.value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PluginMainThreadScheduler::mainThreadCallback(void* context)
-{
- static_cast<PluginMainThreadScheduler*>(context)->dispatchCalls();
-}
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitwinPluginsPluginMainThreadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -58,8 +58,6 @@
</span><span class="cx"> void dispatchCallsForPlugin(NPP, const Deque<Call>& calls);
</span><span class="cx"> typedef HashMap<NPP, Deque<Call>> CallQueueMap;
</span><span class="cx">
</span><del>- static void mainThreadCallback(void* context);
-
</del><span class="cx"> class Call {
</span><span class="cx"> public:
</span><span class="cx"> Call(MainThreadFunction* function, void* userData)
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebDatabaseManager.cpp 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebKit/win/WebDatabaseManager.cpp 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -333,7 +333,9 @@
</span><span class="cx"> static void dispatchToMainThread(WebDatabaseManager* databaseManager, SecurityOrigin* origin)
</span><span class="cx"> {
</span><span class="cx"> DidModifyOriginData* context = new DidModifyOriginData(databaseManager, origin->isolatedCopy());
</span><del>- callOnMainThread(&DidModifyOriginData::dispatchDidModifyOriginOnMainThread, context);
</del><ins>+ callOnMainThread([context] {
+ dispatchDidModifyOriginOnMainThread(context);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebIconDatabase.cpp (188786 => 188787)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebIconDatabase.cpp 2015-08-21 21:59:53 UTC (rev 188786)
+++ trunk/Source/WebKit/win/WebIconDatabase.cpp 2015-08-21 22:01:02 UTC (rev 188787)
</span><span class="lines">@@ -350,7 +350,9 @@
</span><span class="cx">
</span><span class="cx"> if (!m_deliveryRequested) {
</span><span class="cx"> m_deliveryRequested = true;
</span><del>- callOnMainThread(deliverNotifications, 0);
</del><ins>+ callOnMainThread([] {
+ deliverNotifications(0);
+ });
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>