Attachment 347995 Details for Bug 188916 – Patch

[patch] Patch

bug-188916-20180824082545.patch (text/plain), 3.69 KB, created by Zan Dobersek on 2018-08-23 23:25:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2018-08-23 23:25:46 PDT

Size: 3.69 KB

patch

obsolete

>Subversion Revision: 235274
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 50081f9500ade7fbaff3c9b8b769845e7b737a23..deb70264f561ac4ca8701db5d246ac27c9a31c63 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-08-23  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 NOBODY (OOPS!).
>+
>+        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):
>+        * 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..88178b6e50c07e500e176d1f59a066866f1899e0 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);
>diff --git a/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h b/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h
>index 3b5ee9f5711d2123ca0ce68aacda1024c1cc759d..3333cc17f4476074de4365785d784b0e6626cdd5 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;
>@@ -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