Title: [174989] trunk/Source/WebCore
- Revision
- 174989
- Author
- [email protected]
- Date
- 2014-10-21 11:09:49 -0700 (Tue, 21 Oct 2014)
Log Message
REGRESSION(r174676): It broke the !ENABLE(VIDEO) build
https://bugs.webkit.org/show_bug.cgi?id=137916
Reviewed by Csaba Osztrogonác.
Fix the !ENABLE(VIDEO) build by adding an #if ENABLE(VIDEO) where
needed.
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::isDirectlyCompositedImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (174988 => 174989)
--- trunk/Source/WebCore/ChangeLog 2014-10-21 17:58:01 UTC (rev 174988)
+++ trunk/Source/WebCore/ChangeLog 2014-10-21 18:09:49 UTC (rev 174989)
@@ -1,3 +1,16 @@
+2014-10-21 Chris Dumez <[email protected]>
+
+ REGRESSION(r174676): It broke the !ENABLE(VIDEO) build
+ https://bugs.webkit.org/show_bug.cgi?id=137916
+
+ Reviewed by Csaba Osztrogonác.
+
+ Fix the !ENABLE(VIDEO) build by adding an #if ENABLE(VIDEO) where
+ needed.
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::isDirectlyCompositedImage):
+
2014-10-21 Zalan Bujtas <[email protected]>
REGRESSION: Google Search (mobile) video thumbnails are too large.
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (174988 => 174989)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-21 17:58:01 UTC (rev 174988)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2014-10-21 18:09:49 UTC (rev 174989)
@@ -1821,9 +1821,14 @@
// that require painting. Direct compositing saves backing store.
bool RenderLayerBacking::isDirectlyCompositedImage() const
{
- if (!is<RenderImage>(renderer()) || is<RenderMedia>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
+ if (!is<RenderImage>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
return false;
+#if ENABLE(VIDEO)
+ if (is<RenderMedia>(renderer()))
+ return false;
+#endif
+
auto& imageRenderer = downcast<RenderImage>(renderer());
if (CachedImage* cachedImage = imageRenderer.cachedImage()) {
if (!cachedImage->hasImage())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
