Attempt to fix the iOS build after <http://trac.webkit.org/changeset/172889>
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 22:15:27 +0000 (22:15 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 25 Aug 2014 22:15:27 +0000 (22:15 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=109658)

Substitute GraphicsLayer::setContentsToPlatformLayer(..., GraphicsLayer::ContentsLayerForMedia)
for GraphicsLayer::setContentsToMedia(...) because the latter was removed in <http://trac.webkit.org/changeset/172889>.

* WebView/WebView.mm:
(-[WebView _setMediaLayer:forPluginView:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebView.mm

index e62e6f2..75a717b 100644 (file)
@@ -1,3 +1,14 @@
+2014-08-25  Daniel Bates  <dabates@apple.com>
+
+        Attempt to fix the iOS build after <http://trac.webkit.org/changeset/172889>
+        (https://bugs.webkit.org/show_bug.cgi?id=109658)
+
+        Substitute GraphicsLayer::setContentsToPlatformLayer(..., GraphicsLayer::ContentsLayerForMedia)
+        for GraphicsLayer::setContentsToMedia(...) because the latter was removed in <http://trac.webkit.org/changeset/172889>.
+
+        * WebView/WebView.mm:
+        (-[WebView _setMediaLayer:forPluginView:]):
+
 2014-08-22  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r172866.
index 0b706f3..438824d 100644 (file)
@@ -3443,7 +3443,7 @@ static inline IMP getMethod(id o, SEL s)
             continue;
         
         if (layerForWidget->contentsLayerForMedia() != layer) {
-            layerForWidget->setContentsToMedia(layer);
+            layerForWidget->setContentsToPlatformLayer(layer, GraphicsLayer::ContentsLayerForMedia);
             // We need to make sure the layer hierachy change is applied immediately.
             if (mainCoreFrame->view())
                 mainCoreFrame->view()->flushCompositingStateIncludingSubframes();