Changeset 243360 in webkit

Timestamp:

Mar 21, 2019, 9:22:05 PM (6 years ago)

Author:

Simon Fraser

Message:

Clean up some TiledCoreAnimationDrawingArea members
​https://bugs.webkit.org/show_bug.cgi?id=196124

Reviewed by Tim Horton.

The giant m_transform was unused.

Group the bools etc.

• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:

(WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
(WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (modified) (4 diffs)
• WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-21  Simon Fraser  <simon.fraser@apple.com>
+
+        Clean up some TiledCoreAnimationDrawingArea members
+        https://bugs.webkit.org/show_bug.cgi?id=196124
+
+        Reviewed by Tim Horton.
+
+        The giant m_transform was unused.
+        
+        Group the bools etc.
+
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea):
+        (WebKit::TiledCoreAnimationDrawingArea::setRootCompositingLayer):
+
 2019-03-21  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h

@@ -137 +137 @@
     void layerFlushThrottlingTimerFired();
 
-    bool m_layerTreeStateIsFrozen;
-
     std::unique_ptr<LayerHostingContext> m_layerHostingContext;
 
@@ -144 +142 @@
     RetainPtr<CALayer> m_rootLayer;
     RetainPtr<CALayer> m_debugInfoLayer;
-
     RetainPtr<CALayer> m_pendingRootLayer;
-
-    bool m_isPaintingSuspended;
 
     Optional<WebCore::FloatRect> m_viewExposedRect;
     Optional<WebCore::FloatRect> m_scrolledViewExposedRect;
 
+    WebCore::IntSize m_lastViewSizeForScaleToFit;
+    WebCore::IntSize m_lastDocumentSizeForScaleToFit;
+
     WebCore::IntSize m_lastSentIntrinsicContentSize;
-    bool m_inUpdateGeometry;
 
-    double m_transientZoomScale;
+    double m_transientZoomScale { 1 };
     WebCore::FloatPoint m_transientZoomOrigin;
 
-    WebCore::TransformationMatrix m_transform;
+    WebCore::Timer m_layerFlushThrottlingTimer;
 
     RunLoop::Timer<TiledCoreAnimationDrawingArea> m_sendDidUpdateActivityStateTimer;
@@ -166 +163 @@
     RefPtr<WebCore::GraphicsLayer> m_viewOverlayRootLayer;
 
-    bool m_shouldScaleViewToFitDocument { false };
-    bool m_isScalingViewToFitDocument { false };
-    WebCore::IntSize m_lastViewSizeForScaleToFit;
-    WebCore::IntSize m_lastDocumentSizeForScaleToFit;
-
     OptionSet<WebCore::LayoutMilestone> m_pendingNewlyReachedLayoutMilestones;
     Vector<CallbackID> m_pendingCallbackIDs;
@@ -176 +168 @@
     std::unique_ptr<WebCore::RunLoopObserver> m_layerFlushRunLoopObserver;
 
+    bool m_isPaintingSuspended { false };
+    bool m_inUpdateGeometry { false };
+    bool m_layerTreeStateIsFrozen { false };
+    bool m_shouldScaleViewToFitDocument { false };
+    bool m_isScalingViewToFitDocument { false };
     bool m_isThrottlingLayerFlushes { false };
     bool m_isLayerFlushThrottlingTemporarilyDisabledForInteraction { false };
     bool m_needsSendEnterAcceleratedCompositingMode { true };
-
-    WebCore::Timer m_layerFlushThrottlingTimer;
 };
 

trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm

@@ -76 +76 @@
 TiledCoreAnimationDrawingArea::TiledCoreAnimationDrawingArea(WebPage& webPage, const WebPageCreationParameters& parameters)
     : DrawingArea(DrawingAreaTypeTiledCoreAnimation, parameters.drawingAreaIdentifier, webPage)
-    , m_layerTreeStateIsFrozen(false)
+    , m_layerFlushThrottlingTimer(*this, &TiledCoreAnimationDrawingArea::layerFlushThrottlingTimerFired)
+    , m_sendDidUpdateActivityStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateActivityStateTimerFired)
     , m_isPaintingSuspended(!(parameters.activityState & ActivityState::IsVisible))
-    , m_transientZoomScale(1)
-    , m_sendDidUpdateActivityStateTimer(RunLoop::main(), this, &TiledCoreAnimationDrawingArea::didUpdateActivityStateTimerFired)
-    , m_viewOverlayRootLayer(nullptr)
-    , m_layerFlushThrottlingTimer(*this, &TiledCoreAnimationDrawingArea::layerFlushThrottlingTimerFired)
 {
     m_webPage.corePage()->settings().setForceCompositingMode(true);
@@ -699 +696 @@
     bool hadRootLayer = !!m_rootLayer;
     m_rootLayer = layer;
-    [m_rootLayer setSublayerTransform:m_transform];
 
     updateRootLayers();