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 Canonical link: https://commits.webkit.org/162734@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183900 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · May 7, 2015 · 735cb61e94f61b515b700adeea6c6ca3a4fce9d4 · 735cb61
1 parent c710c2e
commit 735cb61e94f61b515b700adeea6c6ca3a4fce9d4
Showing 7 changed files with 42 additions and 96 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -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
diff --git a/LayoutTests/compositing/media-controls-bar-appearance-big.html b/LayoutTests/compositing/media-controls-bar-appearance-big.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -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

diff --git a/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp b/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
@@ -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;
 

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -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:

diff --git a/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm b/Source/WebKit2/Shared/mac/RemoteLayerTreeTransaction.mm
@@ -666,7 +666,6 @@
     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 @@ static void dumpProperty(RemoteLayerTreeTextStream& ts, String name, T value)
     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;