Title: [201046] branches/safari-602.1.32-branch/Source/WebKit2
Diff
Modified: branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog (201045 => 201046)
--- branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 21:35:04 UTC (rev 201045)
+++ branches/safari-602.1.32-branch/Source/WebKit2/ChangeLog 2016-05-17 21:35:06 UTC (rev 201046)
@@ -1,5 +1,20 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200631.
+
+ 2016-05-10 Anders Carlsson <[email protected]>
+
+ Fix more deprecation warnings.
+
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
+ (NetworkServiceInitializer):
+ * PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm:
+ (PluginServiceInitializer):
+ * WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm:
+ (WebContentServiceInitializer):
+
+2016-05-17 Babak Shafiei <[email protected]>
+
Merge r200628.
2016-05-10 Anders Carlsson <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm (201045 => 201046)
--- branches/safari-602.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2016-05-17 21:35:04 UTC (rev 201045)
+++ branches/safari-602.1.32-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2016-05-17 21:35:06 UTC (rev 201046)
@@ -66,6 +66,9 @@
XPCServiceInitializer<NetworkProcess, NetworkServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage);
#if HAVE(OS_ACTIVITY)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
os_activity_end(activity);
+#pragma clang diagnostic pop
#endif
}
Modified: branches/safari-602.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm (201045 => 201046)
--- branches/safari-602.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm 2016-05-17 21:35:04 UTC (rev 201045)
+++ branches/safari-602.1.32-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm 2016-05-17 21:35:06 UTC (rev 201046)
@@ -90,7 +90,10 @@
XPCServiceInitializer<PluginProcess, PluginServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage);
#if HAVE(OS_ACTIVITY)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
os_activity_end(activity);
+#pragma clang diagnostic pop
#endif
#endif // ENABLE(NETSCAPE_PLUGIN_API)
}
Modified: branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm (201045 => 201046)
--- branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm 2016-05-17 21:35:04 UTC (rev 201045)
+++ branches/safari-602.1.32-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm 2016-05-17 21:35:06 UTC (rev 201046)
@@ -66,6 +66,9 @@
XPCServiceInitializer<WebProcess, XPCServiceInitializerDelegate>(adoptOSObject(connection), initializerMessage);
#if HAVE(OS_ACTIVITY)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
os_activity_end(activity);
+#pragma clang diagnostic pop
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
