Changeset 202858 in webkit

Timestamp:

Jul 6, 2016 9:57:25 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r202725.
​https://bugs.webkit.org/show_bug.cgi?id=159473

didn't reduce coreui memory usage (Requested by kling on
#webkit).

Reverted changeset:

"[Mac] Get rid of the old timey rubber-banding linen pattern."
​https://bugs.webkit.org/show_bug.cgi?id=159329
​http://trac.webkit.org/changeset/202725

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ScrollbarTheme.h (modified) (1 diff)
• WebCore/platform/graphics/GraphicsLayer.cpp (modified) (1 diff)
• WebCore/platform/graphics/GraphicsLayer.h (modified) (1 diff)
• WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm (modified) (1 diff)
• WebCore/platform/mac/ScrollbarThemeMac.h (modified) (2 diffs)
• WebCore/platform/mac/ScrollbarThemeMac.mm (modified) (3 diffs)
• WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-07-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r202725.
+        https://bugs.webkit.org/show_bug.cgi?id=159473
+
+        didn't reduce coreui memory usage (Requested by kling on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Mac] Get rid of the old timey rubber-banding linen pattern."
+        https://bugs.webkit.org/show_bug.cgi?id=159329
+        http://trac.webkit.org/changeset/202725
+
 2016-07-06  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/ScrollbarTheme.h

@@ -92 +92 @@
 
 #if ENABLE(RUBBER_BANDING)
+    virtual void setUpOverhangAreasLayerContents(GraphicsLayer*, const Color&) { }
     virtual void setUpContentShadowLayer(GraphicsLayer*) { }
 #endif

trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp

@@ -895 +895 @@
     switch (customAppearance) {
     case GraphicsLayer::CustomAppearance::NoCustomAppearance: ts << "none"; break;
+    case GraphicsLayer::CustomAppearance::ScrollingOverhang: ts << "scrolling-overhang"; break;
     case GraphicsLayer::CustomAppearance::ScrollingShadow: ts << "scrolling-shadow"; break;
     case GraphicsLayer::CustomAppearance::LightBackdropAppearance: ts << "light-backdrop"; break;

trunk/Source/WebCore/platform/graphics/GraphicsLayer.h

@@ -482 +482 @@
     virtual void setDebugBorder(const Color&, float /*borderWidth*/) { }
 
-    enum CustomAppearance { NoCustomAppearance, ScrollingShadow, LightBackdropAppearance, DarkBackdropAppearance };
+    enum CustomAppearance { NoCustomAppearance, ScrollingOverhang, ScrollingShadow, LightBackdropAppearance, DarkBackdropAppearance };
     virtual void setCustomAppearance(CustomAppearance customAppearance) { m_customAppearance = customAppearance; }
     CustomAppearance customAppearance() const { return m_customAppearance; }

trunk/Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm

@@ -952 +952 @@
     case GraphicsLayer::LightBackdropAppearance:
     case GraphicsLayer::DarkBackdropAppearance:
+        ScrollbarThemeMac::removeOverhangAreaBackground(platformLayer());
         ScrollbarThemeMac::removeOverhangAreaShadow(platformLayer());
+        break;
+    case GraphicsLayer::ScrollingOverhang:
+        ScrollbarThemeMac::setUpOverhangAreaBackground(platformLayer());
         break;
     case GraphicsLayer::ScrollingShadow:

trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.h

@@ -69 +69 @@
 
 #if ENABLE(RUBBER_BANDING)
+    WEBCORE_EXPORT static void setUpOverhangAreaBackground(CALayer *, const Color& customBackgroundColor = Color());
+    WEBCORE_EXPORT static void removeOverhangAreaBackground(CALayer *);
+
     WEBCORE_EXPORT static void setUpOverhangAreaShadow(CALayer *);
     WEBCORE_EXPORT static void removeOverhangAreaShadow(CALayer *);
@@ -90 +93 @@
 
 #if ENABLE(RUBBER_BANDING)
+    void setUpOverhangAreasLayerContents(GraphicsLayer*, const Color&) override;
     void setUpContentShadowLayer(GraphicsLayer*) override;
 #endif

trunk/Source/WebCore/platform/mac/ScrollbarThemeMac.mm

@@ -48 +48 @@
 using namespace WebCore;
 
+@interface NSColor (WebNSColorDetails)
++ (NSImage *)_linenPatternImage;
+@end
+
 namespace WebCore {
 
@@ -561 +565 @@
 
 #if ENABLE(RUBBER_BANDING)
+static RetainPtr<CGColorRef> linenBackgroundColor()
+{
+    NSImage *image = nil;
+    CGImageRef cgImage = nullptr;
+    BEGIN_BLOCK_OBJC_EXCEPTIONS;
+    image = [NSColor _linenPatternImage];
+    cgImage = [image CGImageForProposedRect:NULL context:NULL hints:nil];
+    END_BLOCK_OBJC_EXCEPTIONS;
+    
+    if (!cgImage)
+        return nullptr;
+
+    RetainPtr<CGPatternRef> pattern = adoptCF(wkCGPatternCreateWithImageAndTransform(cgImage, CGAffineTransformIdentity, wkPatternTilingNoDistortion));
+    RetainPtr<CGColorSpaceRef> colorSpace = adoptCF(CGColorSpaceCreatePattern(0));
+
+    const CGFloat alpha = 1.0;
+    return adoptCF(CGColorCreateWithPattern(colorSpace.get(), pattern.get(), &alpha));
+}
+
+void ScrollbarThemeMac::setUpOverhangAreaBackground(CALayer *layer, const Color& customBackgroundColor)
+{
+    static CGColorRef cachedLinenBackgroundColor = linenBackgroundColor().leakRef();
+    // We operate on the CALayer directly here, since GraphicsLayer doesn't have the concept
+    // of pattern images, and we know that WebCore won't touch this layer.
+    layer.backgroundColor = customBackgroundColor.isValid() ? cachedCGColor(customBackgroundColor) : cachedLinenBackgroundColor;
+}
+
+void ScrollbarThemeMac::removeOverhangAreaBackground(CALayer *layer)
+{
+    layer.backgroundColor = nil;
+}
+
 void ScrollbarThemeMac::setUpOverhangAreaShadow(CALayer *layer)
 {
@@ -584 +620 @@
 }
 
+void ScrollbarThemeMac::setUpOverhangAreasLayerContents(GraphicsLayer* graphicsLayer, const Color& customBackgroundColor)
+{
+    ScrollbarThemeMac::setUpOverhangAreaBackground(graphicsLayer->platformLayer(), customBackgroundColor);
+}
+
 void ScrollbarThemeMac::setUpContentShadowLayer(GraphicsLayer* graphicsLayer)
 {

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -3271 +3271 @@
 
     m_layerForOverhangAreas->setBackgroundColor(m_rootExtendedBackgroundColor);
+
+    if (!m_rootExtendedBackgroundColor.isValid())
+        m_layerForOverhangAreas->setCustomAppearance(GraphicsLayer::ScrollingOverhang);
 #endif
 }
@@ -3291 +3294 @@
             m_layerForOverhangAreas->setPosition(FloatPoint(0, topContentInset));
             m_layerForOverhangAreas->setAnchorPoint(FloatPoint3D());
-            m_layerForOverhangAreas->setBackgroundColor(m_renderView.frameView().documentBackgroundColor());
+
+            if (m_renderView.frameView().frame().settings().backgroundShouldExtendBeyondPage())
+                m_layerForOverhangAreas->setBackgroundColor(m_renderView.frameView().documentBackgroundColor());
+            else
+                m_layerForOverhangAreas->setCustomAppearance(GraphicsLayer::ScrollingOverhang);
 
             // We want the overhang areas layer to be positioned below the frame contents,

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-07-06  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r202725.
+        https://bugs.webkit.org/show_bug.cgi?id=159473
+
+        didn't reduce coreui memory usage (Requested by kling on
+        #webkit).
+
+        Reverted changeset:
+
+        "[Mac] Get rid of the old timey rubber-banding linen pattern."
+        https://bugs.webkit.org/show_bug.cgi?id=159329
+        http://trac.webkit.org/changeset/202725
+
 2016-07-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Shared/mac/RemoteLayerTreePropertyApplier.mm

@@ -112 +112 @@
     case GraphicsLayer::DarkBackdropAppearance:
     case GraphicsLayer::LightBackdropAppearance:
+        ScrollbarThemeMac::removeOverhangAreaBackground(layer);
         ScrollbarThemeMac::removeOverhangAreaShadow(layer);
+        break;
+    case GraphicsLayer::ScrollingOverhang:
+        ScrollbarThemeMac::setUpOverhangAreaBackground(layer);
         break;
     case GraphicsLayer::ScrollingShadow: