Title: [223749] trunk/Source/WebCore
- Revision
- 223749
- Author
- commit-qu...@webkit.org
- Date
- 2017-10-20 01:30:31 -0700 (Fri, 20 Oct 2017)
Log Message
RenderLayerCompositor: Move implementation of simple methods into the header file.
https://bugs.webkit.org/show_bug.cgi?id=178514
Patch by Frederic Wang <fw...@igalia.com> on 2017-10-20
Reviewed by Darin Adler.
No new tests, behavior unchanged.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223748 => 223749)
--- trunk/Source/WebCore/ChangeLog 2017-10-20 08:29:03 UTC (rev 223748)
+++ trunk/Source/WebCore/ChangeLog 2017-10-20 08:30:31 UTC (rev 223749)
@@ -1,3 +1,12 @@
+2017-10-20 Frederic Wang <fw...@igalia.com>
+
+ RenderLayerCompositor: Move implementation of simple methods into the header file.
+ https://bugs.webkit.org/show_bug.cgi?id=178514
+
+ Reviewed by Darin Adler.
+
+ No new tests, behavior unchanged.
+
2017-10-19 Antti Koivisto <an...@apple.com>
Support ::before/::after pseudo elements on elements with display:contents
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (223748 => 223749)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-10-20 08:29:03 UTC (rev 223748)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-10-20 08:30:31 UTC (rev 223749)
@@ -1929,33 +1929,6 @@
return m_rootContentLayer.get();
}
-GraphicsLayer* RenderLayerCompositor::scrollLayer() const
-{
- return m_scrollLayer.get();
-}
-
-GraphicsLayer* RenderLayerCompositor::clipLayer() const
-{
- return m_clipLayer.get();
-}
-
-GraphicsLayer* RenderLayerCompositor::rootContentLayer() const
-{
- return m_rootContentLayer.get();
-}
-
-#if ENABLE(RUBBER_BANDING)
-GraphicsLayer* RenderLayerCompositor::headerLayer() const
-{
- return m_layerForHeader.get();
-}
-
-GraphicsLayer* RenderLayerCompositor::footerLayer() const
-{
- return m_layerForFooter.get();
-}
-#endif
-
void RenderLayerCompositor::setIsInWindow(bool isInWindow)
{
LOG(Compositing, "RenderLayerCompositor %p setIsInWindow %d", this, isInWindow);
@@ -2831,16 +2804,6 @@
}
}
-void RenderLayerCompositor::setTracksRepaints(bool tracksRepaints)
-{
- m_isTrackingRepaints = tracksRepaints;
-}
-
-bool RenderLayerCompositor::isTrackingRepaints() const
-{
- return m_isTrackingRepaints;
-}
-
float RenderLayerCompositor::deviceScaleFactor() const
{
return m_renderView.document().deviceScaleFactor();
@@ -4062,26 +4025,6 @@
}
#endif
-void RenderLayerCompositor::startTrackingLayerFlushes()
-{
- m_layerFlushCount = 0;
-}
-
-unsigned RenderLayerCompositor::layerFlushCount() const
-{
- return m_layerFlushCount;
-}
-
-void RenderLayerCompositor::startTrackingCompositingUpdates()
-{
- m_compositingUpdateCount = 0;
-}
-
-unsigned RenderLayerCompositor::compositingUpdateCount() const
-{
- return m_compositingUpdateCount;
-}
-
#if ENABLE(CSS_SCROLL_SNAP)
void RenderLayerCompositor::updateScrollSnapPropertiesWithFrameView(const FrameView& frameView)
{
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (223748 => 223749)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2017-10-20 08:29:03 UTC (rev 223748)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2017-10-20 08:30:31 UTC (rev 223749)
@@ -194,13 +194,15 @@
WEBCORE_EXPORT RenderLayer& rootRenderLayer() const;
GraphicsLayer* rootGraphicsLayer() const;
- WEBCORE_EXPORT GraphicsLayer* scrollLayer() const;
- GraphicsLayer* clipLayer() const;
- GraphicsLayer* rootContentLayer() const;
+ GraphicsLayer* scrollLayer() const { return m_scrollLayer.get(); }
+ GraphicsLayer* clipLayer() const { return m_clipLayer.get(); }
+ GraphicsLayer* rootContentLayer() const { return m_rootContentLayer.get(); }
+
+
#if ENABLE(RUBBER_BANDING)
- GraphicsLayer* headerLayer() const;
- GraphicsLayer* footerLayer() const;
+ GraphicsLayer* headerLayer() const { return m_layerForHeader.get(); }
+ GraphicsLayer* footerLayer() const { return m_layerForFooter.get(); }
#endif
enum RootLayerAttachment {
@@ -298,8 +300,9 @@
#endif
void resetTrackedRepaintRects();
- void setTracksRepaints(bool);
+ void setTracksRepaints(bool tracksRepaints) { m_isTrackingRepaints = tracksRepaints; }
+
void setShouldReevaluateCompositingAfterLayout() { m_reevaluateCompositingAfterLayout = true; }
bool viewHasTransparentBackground(Color* backgroundColor = nullptr) const;
@@ -323,11 +326,11 @@
#endif
// For testing.
- WEBCORE_EXPORT void startTrackingLayerFlushes();
- WEBCORE_EXPORT unsigned layerFlushCount() const;
+ void startTrackingLayerFlushes() { m_layerFlushCount = 0; }
+ unsigned layerFlushCount() const { return m_layerFlushCount; }
- WEBCORE_EXPORT void startTrackingCompositingUpdates();
- WEBCORE_EXPORT unsigned compositingUpdateCount() const;
+ void startTrackingCompositingUpdates() { m_compositingUpdateCount = 0; }
+ unsigned compositingUpdateCount() const { return m_compositingUpdateCount; }
private:
class OverlapMap;
@@ -338,7 +341,7 @@
void notifyFlushRequired(const GraphicsLayer*) override;
void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const FloatRect&, GraphicsLayerPaintBehavior) override;
void customPositionForVisibleRectComputation(const GraphicsLayer*, FloatPoint&) const override;
- bool isTrackingRepaints() const override;
+ bool isTrackingRepaints() const override { return m_isTrackingRepaints; }
// GraphicsLayerUpdaterClient implementation
void flushLayersSoon(GraphicsLayerUpdater&) override;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
