Unreviewed, rolling out r183894.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 00:26:48 +0000 (00:26 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 May 2015 00:26:48 +0000 (00:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=144719

crashes on mavericks (Requested by dino on #webkit).

Reverted changeset:

"Handle backdrop views that have to tile"
https://bugs.webkit.org/show_bug.cgi?id=142317
http://trac.webkit.org/changeset/183894

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

LayoutTests/ChangeLog
LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt [deleted file]
LayoutTests/compositing/media-controls-bar-appearance-big.html [deleted file]
Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm

index a3902ab..011a0a8 100644 (file)
@@ -1,3 +1,16 @@
+2015-05-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183894.
+        https://bugs.webkit.org/show_bug.cgi?id=144719
+
+        crashes on mavericks (Requested by dino on #webkit).
+
+        Reverted changeset:
+
+        "Handle backdrop views that have to tile"
+        https://bugs.webkit.org/show_bug.cgi?id=142317
+        http://trac.webkit.org/changeset/183894
+
 2015-05-06  Jon Lee  <jonlee@apple.com>
 
         Expose more font weights for -apple-system
diff --git a/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt b/LayoutTests/compositing/media-controls-bar-appearance-big-expected.txt
deleted file mode 100644 (file)
index a51a8bc..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-(GraphicsLayer
-  (anchor 0.00 0.00)
-  (bounds 2056.00 4117.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2056.00 4117.00)
-      (contentsOpaque 1)
-      (children 2
-        (GraphicsLayer
-          (position 8.00 8.00)
-          (bounds 2048.00 2048.00)
-          (drawsContent 1)
-        )
-        (GraphicsLayer
-          (position 8.00 2056.00)
-          (bounds 2048.00 2048.00)
-          (drawsContent 1)
-        )
-      )
-    )
-  )
-)
-
diff --git a/LayoutTests/compositing/media-controls-bar-appearance-big.html b/LayoutTests/compositing/media-controls-bar-appearance-big.html
deleted file mode 100644 (file)
index 0df76b1..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <style>
-        div {
-            position: relative;
-            height: 100px;
-            width: 100px;
-        }
-        .big {
-            width: 2048px;
-            height: 2048px;
-        }
-        .media-controls {
-            -webkit-transform: translate3d(0, 0, 0); /* The element has to request a layer for the appearance to work */
-        }
-        .dark {
-            -webkit-appearance: media-controls-dark-bar-background;
-        }
-        .light {
-            -webkit-appearance: media-controls-light-bar-background;
-        }
-    </style>
-    <script>
-        if (window.testRunner) {
-            testRunner.dumpAsText();
-            testRunner.waitUntilDone();
-        }
-
-        function change()
-        {
-            var elements = document.querySelectorAll(".media-controls");
-            for (var i = 0; i < elements.length; ++i)
-                elements[i].classList.add("big");
-            setTimeout(dumpLayers, 0);
-        }
-
-        function dumpLayers()
-        {
-            var layersResult = document.getElementById('layers');
-            if (window.testRunner) {
-                layersResult.innerText = window.internals.layerTreeAsText(document);
-                testRunner.notifyDone();
-            }
-        }
-        window.addEventListener('load', change, false)
-    </script>
-</head>
-<body>
-    <div class="media-controls dark">
-    </div>
-    <div class="media-controls light">
-    </div>
-<pre id="layers"></pre>
-</body>
-</html>
index 350347d..c088778 100644 (file)
@@ -1,3 +1,16 @@
+2015-05-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183894.
+        https://bugs.webkit.org/show_bug.cgi?id=144719
+
+        crashes on mavericks (Requested by dino on #webkit).
+
+        Reverted changeset:
+
+        "Handle backdrop views that have to tile"
+        https://bugs.webkit.org/show_bug.cgi?id=142317
+        http://trac.webkit.org/changeset/183894
+
 2015-05-06  Jon Lee  <jonlee@apple.com>
 
         CoreTextSPI.h uses wrong version number to denote Yosemite
index bd6400f..a5f802b 100644 (file)
@@ -1438,10 +1438,10 @@ void GraphicsLayerCA::commitLayerChangesBeforeSublayers(CommitState& commitState
     bool needBackdropLayerType = (customAppearance() == LightBackdropAppearance || customAppearance() == DarkBackdropAppearance);
     PlatformCALayer::LayerType neededLayerType = m_layer->layerType();
 
-    if (needBackdropLayerType)
-        neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
-    else if (needTiledLayer)
+    if (needTiledLayer)
         neededLayerType = PlatformCALayer::LayerTypeTiledBackingLayer;
+    else if (needBackdropLayerType)
+        neededLayerType = layerTypeForCustomBackdropAppearance(customAppearance());
     else if (isCustomBackdropLayerType(m_layer->layerType()) || m_usingTiledBacking)
         neededLayerType = PlatformCALayer::LayerTypeWebLayer;
 
index f98186b..bd10f1f 100644 (file)
@@ -1,3 +1,16 @@
+2015-05-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183894.
+        https://bugs.webkit.org/show_bug.cgi?id=144719
+
+        crashes on mavericks (Requested by dino on #webkit).
+
+        Reverted changeset:
+
+        "Handle backdrop views that have to tile"
+        https://bugs.webkit.org/show_bug.cgi?id=142317
+        http://trac.webkit.org/changeset/183894
+
 2015-05-06  Brady Eidson  <beidson@apple.com>
 
         Addition review followup for:
index 2760768..3aa7b26 100644 (file)
@@ -666,7 +666,6 @@ public:
     RemoteLayerTreeTextStream& operator<<(const FilterOperations&);
     RemoteLayerTreeTextStream& operator<<(const PlatformCAAnimationRemote::Properties&);
     RemoteLayerTreeTextStream& operator<<(const RemoteLayerBackingStore&);
-    RemoteLayerTreeTextStream& operator<<(const WebCore::GraphicsLayer::CustomAppearance&);
     RemoteLayerTreeTextStream& operator<<(BlendMode);
     RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::AnimationType);
     RemoteLayerTreeTextStream& operator<<(PlatformCAAnimation::FillModeType);
@@ -838,19 +837,6 @@ RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const FilterOpe
     return ts;
 }
 
-RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(const WebCore::GraphicsLayer::CustomAppearance& customAppearance)
-{
-    RemoteLayerTreeTextStream& ts = *this;
-    switch (customAppearance) {
-    case WebCore::GraphicsLayer::CustomAppearance::NoCustomAppearance: ts << "none"; break;
-    case WebCore::GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
-    case WebCore::GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
-    case WebCore::GraphicsLayer::CustomAppearance::LightBackdropAppearance: ts << "light-backdrop"; break;
-    case WebCore::GraphicsLayer::CustomAppearance::DarkBackdropAppearance: ts << "dark-backdrop"; break;
-    }
-    return ts;
-}
-
 RemoteLayerTreeTextStream& RemoteLayerTreeTextStream::operator<<(BlendMode blendMode)
 {
     RemoteLayerTreeTextStream& ts = *this;