Title: [243360] trunk/Source/WebKit
- Revision
- 243360
- Author
- [email protected]
- Date
- 2019-03-21 21:22:05 -0700 (Thu, 21 Mar 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (243359 => 243360)
--- trunk/Source/WebKit/ChangeLog 2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/ChangeLog 2019-03-22 04:22:05 UTC (rev 243360)
@@ -1,3 +1,19 @@
+2019-03-21 Simon Fraser <[email protected]>
+
+ 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 <[email protected]>
Certain WebProcesses should opt-out of the freezer.
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (243359 => 243360)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2019-03-22 04:22:05 UTC (rev 243360)
@@ -136,28 +136,25 @@
void startLayerFlushThrottlingTimer();
void layerFlushThrottlingTimerFired();
- bool m_layerTreeStateIsFrozen;
-
std::unique_ptr<LayerHostingContext> m_layerHostingContext;
RetainPtr<CALayer> m_hostingLayer;
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;
Vector<CallbackID> m_nextActivityStateChangeCallbackIDs;
@@ -165,21 +162,19 @@
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;
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;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (243359 => 243360)
--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-03-22 04:15:58 UTC (rev 243359)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2019-03-22 04:22:05 UTC (rev 243360)
@@ -75,12 +75,9 @@
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);
@@ -698,7 +695,6 @@
bool hadRootLayer = !!m_rootLayer;
m_rootLayer = layer;
- [m_rootLayer setSublayerTransform:m_transform];
updateRootLayers();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
