Title: [235314] trunk/Source/WebCore
- Revision
- 235314
- Author
- [email protected]
- Date
- 2018-08-24 02:13:46 -0700 (Fri, 24 Aug 2018)
Log Message
[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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (235313 => 235314)
--- trunk/Source/WebCore/ChangeLog 2018-08-24 09:03:57 UTC (rev 235313)
+++ trunk/Source/WebCore/ChangeLog 2018-08-24 09:13:46 UTC (rev 235314)
@@ -1,3 +1,22 @@
+2018-08-24 Zan Dobersek <[email protected]>
+
+ [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-24 Antti Koivisto <[email protected]>
Use OptionSet::containsAny and containsAll in some more places
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (235313 => 235314)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2018-08-24 09:03:57 UTC (rev 235313)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp 2018-08-24 09:13:46 UTC (rev 235314)
@@ -143,6 +143,21 @@
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 @@
client().notifyAnimationStarted(this, "", m_lastAnimationStartTime);
}
+bool CoordinatedGraphicsLayer::usesContentsLayer() const
+{
+ return m_nicosia.contentLayer || m_compositedImage;
+}
+
} // namespace WebCore
#endif // USE(COORDINATED_GRAPHICS)
Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h (235313 => 235314)
--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2018-08-24 09:03:57 UTC (rev 235313)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.h 2018-08-24 09:13:46 UTC (rev 235314)
@@ -58,7 +58,9 @@
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 @@
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 @@
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 @@
const RefPtr<Nicosia::CompositionLayer>& compositionLayer() const;
private:
- bool isCoordinatedGraphicsLayer() const override { return true; }
+ bool isCoordinatedGraphicsLayer() const;
void updatePlatformLayer();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
