Fix the build following <http://trac.webkit.org/changeset/155591>
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Sep 2013 19:56:40 +0000 (19:56 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 16 Sep 2013 19:56:40 +0000 (19:56 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=121200)

Fix the build for ports that enable PLUGIN_PROXY_FOR_VIDEO, such as iOS WebKit.

* html/shadow/MediaControlElements.cpp:
(WebCore::MediaControlTextTrackContainerElement::updateSizes): Substitute isWidget() for isRenderWidget()
as the latter is undefined.
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::requiresCompositingForVideo): Ditto.

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

Source/WebCore/ChangeLog
Source/WebCore/html/shadow/MediaControlElements.cpp
Source/WebCore/rendering/RenderLayerCompositor.cpp

index f169ab1..467ad41 100644 (file)
@@ -1,5 +1,18 @@
 2013-09-16  Daniel Bates  <dabates@apple.com>
 
+        Fix the build following <http://trac.webkit.org/changeset/155591>
+        (https://bugs.webkit.org/show_bug.cgi?id=121200)
+
+        Fix the build for ports that enable PLUGIN_PROXY_FOR_VIDEO, such as iOS WebKit.
+
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlTextTrackContainerElement::updateSizes): Substitute isWidget() for isRenderWidget()
+        as the latter is undefined.
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingForVideo): Ditto.
+
+2013-09-16  Daniel Bates  <dabates@apple.com>
+
         Build fix following <https://trac.webkit.org/r154358>
         (https://bugs.webkit.org/show_bug.cgi?id=120078)
 
index 5e04ce2..74d180d 100644 (file)
@@ -1375,7 +1375,7 @@ void MediaControlTextTrackContainerElement::updateSizes(bool forceUpdate)
         videoBox = m_textTrackRepresentation->bounds();
     else {
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-        if (!mediaElement->renderer() || !mediaElement->renderer()->isRenderWidget())
+        if (!mediaElement->renderer() || !mediaElement->renderer()->isWidget())
             return;
         videoBox = pixelSnappedIntRect(toRenderWidget(mediaElement->renderer())->contentBoxRect());
 #else
index 6a40d75..8aa7fc0 100644 (file)
@@ -2076,7 +2076,7 @@ bool RenderLayerCompositor::requiresCompositingForVideo(RenderObject* renderer)
         return (video.requiresImmediateCompositing() || video.shouldDisplayVideo()) && canAccelerateVideoRendering(video);
     }
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    else if (renderer->isRenderWidget()) {
+    else if (renderer->isWidget()) {
         if (!m_hasAcceleratedCompositing)
             return false;