- Revision
- 258513
- Author
- [email protected]
- Date
- 2020-03-16 12:56:36 -0700 (Mon, 16 Mar 2020)
Log Message
Remove unused IPC messages from DrawingAreaProxy
https://bugs.webkit.org/show_bug.cgi?id=209090
<rdar://problem/60333300>
Reviewed by Wenson Hsieh.
Do not compile the following three unused messages in DrawingAreaProxy when
building for a Cocoa platform target.
DrawingAreaProxy::Update
DrawingAreaProxy::DidUpdateBackingStoreState
DrawingAreaProxy::ExitAcceleratedCompositingMode
* UIProcess/DrawingAreaProxy.h:
(WebKit::DrawingAreaProxy::enterAcceleratedCompositingMode):
(WebKit::DrawingAreaProxy::update):
(WebKit::DrawingAreaProxy::didUpdateBackingStoreState):
(WebKit::DrawingAreaProxy::exitAcceleratedCompositingMode):
* UIProcess/DrawingAreaProxy.messages.in:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
* UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
(WebKit::TiledCoreAnimationDrawingAreaProxy::exitAcceleratedCompositingMode): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (258512 => 258513)
--- trunk/Source/WebKit/ChangeLog 2020-03-16 19:50:59 UTC (rev 258512)
+++ trunk/Source/WebKit/ChangeLog 2020-03-16 19:56:36 UTC (rev 258513)
@@ -1,3 +1,28 @@
+2020-03-16 Brent Fulgham <[email protected]>
+
+ Remove unused IPC messages from DrawingAreaProxy
+ https://bugs.webkit.org/show_bug.cgi?id=209090
+ <rdar://problem/60333300>
+
+ Reviewed by Wenson Hsieh.
+
+ Do not compile the following three unused messages in DrawingAreaProxy when
+ building for a Cocoa platform target.
+
+ DrawingAreaProxy::Update
+ DrawingAreaProxy::DidUpdateBackingStoreState
+ DrawingAreaProxy::ExitAcceleratedCompositingMode
+
+ * UIProcess/DrawingAreaProxy.h:
+ (WebKit::DrawingAreaProxy::enterAcceleratedCompositingMode):
+ (WebKit::DrawingAreaProxy::update):
+ (WebKit::DrawingAreaProxy::didUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxy::exitAcceleratedCompositingMode):
+ * UIProcess/DrawingAreaProxy.messages.in:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h:
+ * UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm:
+ (WebKit::TiledCoreAnimationDrawingAreaProxy::exitAcceleratedCompositingMode): Deleted.
+
2020-03-16 Per Arne Vollan <[email protected]>
[Cocoa] Only set CF prefs direct mode for the WebContent process
Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h (258512 => 258513)
--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2020-03-16 19:50:59 UTC (rev 258512)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2020-03-16 19:56:36 UTC (rev 258513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-2020 Apple Inc. All rights reserved.
* Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,8 +71,10 @@
const WebCore::IntSize& size() const { return m_size; }
bool setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset = { });
+#if !PLATFORM(COCOA)
// The timeout we use when waiting for a DidUpdateGeometry message.
static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
+#endif
virtual void colorSpaceDidChange() { }
virtual void minimumSizeForAutoLayoutDidChange() { }
@@ -137,10 +139,7 @@
// Message handlers.
// FIXME: These should be pure virtual.
- virtual void update(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
- virtual void didUpdateBackingStoreState(uint64_t /* backingStoreStateID */, const UpdateInfo&, const LayerTreeContext&) { }
virtual void enterAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
- virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
virtual void updateAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const LayerTreeContext&) { }
#if PLATFORM(COCOA)
virtual void didUpdateGeometry() { }
@@ -150,6 +149,11 @@
Optional<WebCore::FloatRect> m_viewExposedRect;
Optional<WebCore::FloatRect> m_lastSentViewExposedRect;
#endif // PLATFORM(MAC)
+
+#else
+ virtual void update(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
+ virtual void didUpdateBackingStoreState(uint64_t /* backingStoreStateID */, const UpdateInfo&, const LayerTreeContext&) { }
+ virtual void exitAcceleratedCompositingMode(uint64_t /* backingStoreStateID */, const UpdateInfo&) { }
#endif
};
Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in (258512 => 258513)
--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in 2020-03-16 19:50:59 UTC (rev 258512)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in 2020-03-16 19:56:36 UTC (rev 258513)
@@ -1,4 +1,4 @@
-# Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
+# Copyright (C) 2010-2020 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -21,10 +21,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
messages -> DrawingAreaProxy NotRefCounted {
- Update(uint64_t stateID, WebKit::UpdateInfo updateInfo)
- DidUpdateBackingStoreState(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo, WebKit::LayerTreeContext context)
EnterAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::LayerTreeContext context)
- ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo)
UpdateAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::LayerTreeContext context)
DispatchPresentationCallbacksAfterFlushingLayers(Vector<WebKit::CallbackID> callbackIDs);
@@ -32,4 +29,10 @@
// Used by TiledCoreAnimationDrawingAreaProxy.
DidUpdateGeometry()
#endif
+
+#if !PLATFORM(COCOA)
+ Update(uint64_t stateID, WebKit::UpdateInfo updateInfo)
+ DidUpdateBackingStoreState(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo, WebKit::LayerTreeContext context)
+ ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo)
+#endif
}
Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h (258512 => 258513)
--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2020-03-16 19:50:59 UTC (rev 258512)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.h 2020-03-16 19:56:36 UTC (rev 258513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -44,7 +44,6 @@
void minimumSizeForAutoLayoutDidChange() override;
void enterAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override;
- void exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&) override;
void updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext&) override;
void adjustTransientZoom(double scale, WebCore::FloatPoint origin) override;
Modified: trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm (258512 => 258513)
--- trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2020-03-16 19:50:59 UTC (rev 258512)
+++ trunk/Source/WebKit/UIProcess/mac/TiledCoreAnimationDrawingAreaProxy.mm 2020-03-16 19:56:36 UTC (rev 258513)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2020 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -95,12 +95,6 @@
m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
}
-void TiledCoreAnimationDrawingAreaProxy::exitAcceleratedCompositingMode(uint64_t backingStoreStateID, const UpdateInfo&)
-{
- // This should never be called.
- ASSERT_NOT_REACHED();
-}
-
void TiledCoreAnimationDrawingAreaProxy::updateAcceleratedCompositingMode(uint64_t backingStoreStateID, const LayerTreeContext& layerTreeContext)
{
m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
