Attachment 347997 Details for Bug 188916 – Patch for landing

[patch] Patch for landing

bug-188916-20180824095515.patch (text/plain), 4.53 KB, created by Zan Dobersek on 2018-08-24 00:55:16 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2018-08-24 00:55:16 PDT

Size: 4.53 KB

patch

obsolete

>Subversion Revision: 235274
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 50081f9500ade7fbaff3c9b8b769845e7b737a23..7cbf3966f18e2d97aaacbb973da319c1022494e2 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,22 @@
>+2018-08-24  Zan Dobersek  <zdobersek@igalia.com>
>+
>+        [CoordGraphics] Move inline methods on CoordinatedGraphicsLayer out-of-line
>+        https://bugs.webkit.org/show_bug.cgi?id=188916
>+
>+        Reviewed by Carlos Garcia Campos.
>+
>+        Style checker produced complaints that CoordinatedGraphicsLayer class is
>+        using inline-defined methods despite the WEBCORE_EXPORT macro being used
>+        for the whole class. Keep the macro where it is but instead move the
>+        method definitions out-of-line.
>+
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
>+        (WebCore::CoordinatedGraphicsLayer::isCoordinatedGraphicsLayer const):
>+        (WebCore::CoordinatedGraphicsLayer::id const):
>+        (WebCore::CoordinatedGraphicsLayer::primaryLayerID const):
>+        (WebCore::CoordinatedGraphicsLayer::usesContentsLayer const):
>+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h:
>+
> 2018-08-23  Simon Fraser  <simon.fraser@apple.com>
> 
>         Add support for dumping GC heap snapshots, and a viewer
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>index 6aff0fd4c397bbf38722e3ba2bb58c484aa5c561..7b0b295207a9337a7a7b55d2ae5f4a661263a1e2 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
>@@ -143,6 +143,21 @@ CoordinatedGraphicsLayer::~CoordinatedGraphicsLayer()
>     willBeDestroyed();
> }
> 
>+bool CoordinatedGraphicsLayer::isCoordinatedGraphicsLayer() const
>+{
>+    return true;
>+}
>+
>+Nicosia::PlatformLayer::LayerID CoordinatedGraphicsLayer::id() const
>+{
>+    return m_id;
>+}
>+
>+auto CoordinatedGraphicsLayer::primaryLayerID() const -> PlatformLayerID
>+{
>+    return id();
>+}
>+
> bool CoordinatedGraphicsLayer::setChildren(const Vector<GraphicsLayer*>& children)
> {
>     bool ok = GraphicsLayer::setChildren(children);
>@@ -1166,6 +1181,11 @@ void CoordinatedGraphicsLayer::animationStartedTimerFired()
>     client().notifyAnimationStarted(this, "", m_lastAnimationStartTime);
> }
> 
>+bool CoordinatedGraphicsLayer::usesContentsLayer() const
>+{
>+    return m_nicosia.contentLayer || m_compositedImage;
>+}
>+
> } // namespace WebCore
> 
> #endif // USE(COORDINATED_GRAPHICS)
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>index 3b5ee9f5711d2123ca0ce68aacda1024c1cc759d..f679b2c95370a3bfafafa78b1d0858fa0490092e 100644
>--- a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>+++ b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>@@ -58,7 +58,9 @@ public:
>     explicit CoordinatedGraphicsLayer(Type, GraphicsLayerClient&);
>     virtual ~CoordinatedGraphicsLayer();
> 
>-    PlatformLayerID primaryLayerID() const override { return id(); }
>+    // FIXME: Merge these two methods.
>+    Nicosia::PlatformLayer::LayerID id() const;
>+    PlatformLayerID primaryLayerID() const override;
> 
>     // Reimplementations from GraphicsLayer.h.
>     bool setChildren(const Vector<GraphicsLayer*>&) override;
>@@ -103,7 +105,7 @@ public:
>     void removeAnimation(const String&) override;
>     void suspendAnimations(MonotonicTime) override;
>     void resumeAnimations() override;
>-    bool usesContentsLayer() const override { return m_nicosia.contentLayer || m_compositedImage; }
>+    bool usesContentsLayer() const override;
> 
>     void syncPendingStateChangesIncludingSubLayers();
>     void updateContentBuffersIncludingSubLayers();
>@@ -111,8 +113,6 @@ public:
>     FloatPoint computePositionRelativeToBase();
>     void computePixelAlignment(FloatPoint& position, FloatSize&, FloatPoint3D& anchorPoint, FloatSize& alignmentOffset);
> 
>-    Nicosia::PlatformLayer::LayerID id() const { return m_id; }
>-
>     IntRect transformedVisibleRect();
> 
>     void setCoordinator(CoordinatedGraphicsLayerClient*);
>@@ -124,7 +124,7 @@ public:
>     const RefPtr<Nicosia::CompositionLayer>& compositionLayer() const;
> 
> private:
>-    bool isCoordinatedGraphicsLayer() const override { return true; }
>+    bool isCoordinatedGraphicsLayer() const;
> 
>     void updatePlatformLayer();
>

Actions: View | Formatted Diff | Diff

Attachments on bug 188916: 347995 | 347997