Title: [184592] branches/safari-601.1.32.2-branch/Source/WebCore
Diff
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog (184591 => 184592)
--- branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-19 21:39:46 UTC (rev 184591)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/ChangeLog 2015-05-19 21:45:01 UTC (rev 184592)
@@ -1,3 +1,14 @@
+2015-05-19 Babak Shafiei <[email protected]>
+
+ Merge r184406.
+
+ 2015-05-15 Eric Carlson <[email protected]>
+
+ Unreviewed build fix.
+
+ * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Add clang pragmas to ignore
+ deprecation warnings.
+
2015-05-18 Matthew Hanson <[email protected]>
Merge r184513. rdar://problem/21006738
Modified: branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (184591 => 184592)
--- branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-05-19 21:39:46 UTC (rev 184591)
+++ branches/safari-601.1.32.2-branch/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm 2015-05-19 21:45:01 UTC (rev 184592)
@@ -1129,6 +1129,8 @@
});
}
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
void WebVideoFullscreenInterfaceAVKit::cleanupFullscreenInternal()
{
LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::cleanupFullscreenInternal(%p)", this);
@@ -1178,6 +1180,7 @@
strongThis->m_enterRequested = false;
});
}
+#pragma clang diagnostic pop
void WebVideoFullscreenInterfaceAVKit::invalidate()
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
