Skip to content

Instantly share code, notes, and snippets.

@grorg

grorg/namespace.patch

Created November 21, 2018 00:53
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save grorg/bf2190e15f6d88c8ff1a569b094791b1 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save grorg/bf2190e15f6d88c8ff1a569b094791b1 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. grorg created this gist Nov 21, 2018.
    79 changes: 79 additions & 0 deletions namespace.patch
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,79 @@
    diff --git a/Source/WebCore/platform/graphics/mac/WebLayer.mm b/Source/WebCore/platform/graphics/mac/WebLayer.mm
    index 1103d37e62d..808804b2f85 100644
    --- a/Source/WebCore/platform/graphics/mac/WebLayer.mm
    +++ b/Source/WebCore/platform/graphics/mac/WebLayer.mm
    @@ -39,8 +39,6 @@
    #import "WebCoreThread.h"
    #endif

    -using namespace WebCore;
    -
    #if PLATFORM(IOS_FAMILY)
    @interface WebLayer(Private)
    - (void)drawScaledContentsInContext:(CGContextRef)context;
    @@ -51,10 +49,10 @@ using namespace WebCore;

    - (void)drawInContext:(CGContextRef)context
    {
    - PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
    + WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    if (layer) {
    - PlatformCALayer::RepaintRectList rectsToPaint = PlatformCALayer::collectRectsToPaint(context, layer);
    - PlatformCALayer::drawLayerContents(context, layer, rectsToPaint, self.isRenderingInContext ? GraphicsLayerPaintSnapshotting : GraphicsLayerPaintNormal);
    + WebCore::PlatformCALayer::RepaintRectList rectsToPaint = WebCore::PlatformCALayer::collectRectsToPaint(context, layer);
    + WebCore::PlatformCALayer::drawLayerContents(context, layer, rectsToPaint, self.isRenderingInContext ? WebCore::GraphicsLayerPaintSnapshotting : WebCore::GraphicsLayerPaintNormal);
    }
    }

    @@ -81,20 +79,20 @@ using namespace WebCore;

    - (void)setNeedsDisplay
    {
    - PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
    + WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    if (layer && layer->owner() && layer->owner()->platformCALayerDrawsContent())
    [super setNeedsDisplay];
    }

    - (void)setNeedsDisplayInRect:(CGRect)dirtyRect
    {
    - PlatformCALayer* platformLayer = PlatformCALayer::platformCALayer((__bridge void*)self);
    + WebCore::PlatformCALayer* platformLayer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    if (!platformLayer) {
    [super setNeedsDisplayInRect:dirtyRect];
    return;
    }

    - if (PlatformCALayerClient* layerOwner = platformLayer->owner()) {
    + if (WebCore::PlatformCALayerClient* layerOwner = platformLayer->owner()) {
    if (layerOwner->platformCALayerDrawsContent()) {
    [super setNeedsDisplayInRect:dirtyRect];

    @@ -115,7 +113,7 @@ using namespace WebCore;
    #endif
    ASSERT(isMainThread());
    [super display];
    - PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
    + WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    if (layer && layer->owner())
    layer->owner()->platformCALayerLayerDidDisplay(layer);
    }
    @@ -127,14 +125,14 @@ using namespace WebCore;
    WebThreadLock();
    #endif
    ASSERT(isMainThread());
    - PlatformCALayer* layer = PlatformCALayer::platformCALayer((__bridge void*)self);
    + WebCore::PlatformCALayer* layer = WebCore::PlatformCALayer::platformCALayer((__bridge void*)self);
    if (layer && layer->owner()) {
    - GraphicsContext graphicsContext(context);
    + WebCore::GraphicsContext graphicsContext(context);
    graphicsContext.setIsCALayerContext(true);
    graphicsContext.setIsAcceleratedContext(layer->acceleratesDrawing());

    - FloatRect clipBounds = CGContextGetClipBoundingBox(context);
    - layer->owner()->platformCALayerPaintContents(layer, graphicsContext, clipBounds, self.isRenderingInContext ? GraphicsLayerPaintSnapshotting : GraphicsLayerPaintNormal);
    + WebCore::FloatRect clipBounds = CGContextGetClipBoundingBox(context);
    + layer->owner()->platformCALayerPaintContents(layer, graphicsContext, clipBounds, self.isRenderingInContext ? WebCore::GraphicsLayerPaintSnapshotting : WebCore::GraphicsLayerPaintNormal);
    }
    }