Diff
Modified: trunk/Source/WebCore/ChangeLog (188786 => 188787)
--- 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)
@@ -1,3 +1,16 @@
+2015-08-21 Anders Carlsson <[email protected]>
+
+ 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):
+
2015-08-20 Matt Rajca <[email protected]>
Media Session: let UI clients change the volume of the focused media element
Modified: trunk/Source/WebCore/platform/network/NetworkStateNotifier.h (188786 => 188787)
--- 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)
@@ -82,7 +82,6 @@
#elif PLATFORM(WIN)
static void CALLBACK addrChangeCallback(void*, BOOLEAN timedOut);
- static void callAddressChanged(void*);
void addressChanged();
void registerForAddressChange();
Modified: trunk/Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp (188786 => 188787)
--- 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)
@@ -43,15 +43,11 @@
static CookieChangeCallbackPtr cookieChangeCallback;
-static void notifyCookiesChangedOnMainThread(void*)
-{
- ASSERT(isMainThread());
- cookieChangeCallback();
-}
-
static void notifyCookiesChanged(CFHTTPCookieStorageRef, void *)
{
- callOnMainThread(notifyCookiesChangedOnMainThread, 0);
+ callOnMainThread([] {
+ cookieChangeCallback();
+ });
}
static inline CFRunLoopRef cookieStorageObserverRunLoop()
Modified: trunk/Source/WebCore/platform/network/win/NetworkStateNotifierWin.cpp (188786 => 188787)
--- 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)
@@ -87,11 +87,15 @@
void CALLBACK NetworkStateNotifier::addrChangeCallback(void* context, BOOLEAN timedOut)
{
+ NetworkStateNotifier* notifier = static_cast<NetworkStateNotifier*>(context);
+
// NotifyAddrChange only notifies us of a single address change. Now that we've been notified,
// we need to call it again so we'll get notified the *next* time.
- static_cast<NetworkStateNotifier*>(context)->registerForAddressChange();
+ notifier->registerForAddressChange();
- callOnMainThread(callAddressChanged, context);
+ callOnMainThread([notifier] {
+ notifier->addressChanged();
+ }
}
void NetworkStateNotifier::registerForAddressChange()
Modified: trunk/Source/WebKit/win/ChangeLog (188786 => 188787)
--- 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)
@@ -1,3 +1,19 @@
+2015-08-21 Anders Carlsson <[email protected]>
+
+ 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):
+
2015-08-20 Brent Fulgham <[email protected]>
[Win] Miscellaneous Windows Cleanups
Modified: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.cpp (188786 => 188787)
--- 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)
@@ -51,7 +51,9 @@
it->value.append(Call(function, userData));
if (!m_callPending) {
- callOnMainThread(mainThreadCallback, this);
+ callOnMainThread([this] {
+ dispatchCalls();
+ });
m_callPending = true;
}
}
@@ -102,9 +104,4 @@
dispatchCallsForPlugin(entry.key, entry.value);
}
-void PluginMainThreadScheduler::mainThreadCallback(void* context)
-{
- static_cast<PluginMainThreadScheduler*>(context)->dispatchCalls();
-}
-
} // namespace WebCore
Modified: trunk/Source/WebKit/win/Plugins/PluginMainThreadScheduler.h (188786 => 188787)
--- 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)
@@ -58,8 +58,6 @@
void dispatchCallsForPlugin(NPP, const Deque<Call>& calls);
typedef HashMap<NPP, Deque<Call>> CallQueueMap;
- static void mainThreadCallback(void* context);
-
class Call {
public:
Call(MainThreadFunction* function, void* userData)
Modified: trunk/Source/WebKit/win/WebDatabaseManager.cpp (188786 => 188787)
--- 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)
@@ -333,7 +333,9 @@
static void dispatchToMainThread(WebDatabaseManager* databaseManager, SecurityOrigin* origin)
{
DidModifyOriginData* context = new DidModifyOriginData(databaseManager, origin->isolatedCopy());
- callOnMainThread(&DidModifyOriginData::dispatchDidModifyOriginOnMainThread, context);
+ callOnMainThread([context] {
+ dispatchDidModifyOriginOnMainThread(context);
+ });
}
private:
Modified: trunk/Source/WebKit/win/WebIconDatabase.cpp (188786 => 188787)
--- 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)
@@ -350,7 +350,9 @@
if (!m_deliveryRequested) {
m_deliveryRequested = true;
- callOnMainThread(deliverNotifications, 0);
+ callOnMainThread([] {
+ deliverNotifications(0);
+ });
}
}
