Title: [260177] trunk/Source/WebKit
- Revision
- 260177
- Author
- [email protected]
- Date
- 2020-04-16 04:39:44 -0700 (Thu, 16 Apr 2020)
Log Message
[IPC hardening] DrawingArea::updateBackingStoreState() is not used on Apple platforms
<https://webkit.org/b/210585>
<rdar://problem/61802011>
Reviewed by Geoffrey Garen.
* UIProcess/DrawingAreaProxy.h:
* UIProcess/DrawingAreaProxy.messages.in:
* WebProcess/WebPage/DrawingArea.h:
(WebKit::DrawingArea::updateBackingStoreState):
* WebProcess/WebPage/DrawingArea.messages.in:
- Use USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) to
protect code not used on Apple platforms.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (260176 => 260177)
--- trunk/Source/WebKit/ChangeLog 2020-04-16 11:22:51 UTC (rev 260176)
+++ trunk/Source/WebKit/ChangeLog 2020-04-16 11:39:44 UTC (rev 260177)
@@ -1,3 +1,19 @@
+2020-04-16 David Kilzer <[email protected]>
+
+ [IPC hardening] DrawingArea::updateBackingStoreState() is not used on Apple platforms
+ <https://webkit.org/b/210585>
+ <rdar://problem/61802011>
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/DrawingAreaProxy.h:
+ * UIProcess/DrawingAreaProxy.messages.in:
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::updateBackingStoreState):
+ * WebProcess/WebPage/DrawingArea.messages.in:
+ - Use USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER) to
+ protect code not used on Apple platforms.
+
2020-04-16 Carlos Alberto Lopez Perez <[email protected]>
[GTK] MiniBrowser opens new windows too small causing failures on some WPT tests
Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h (260176 => 260177)
--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2020-04-16 11:22:51 UTC (rev 260176)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.h 2020-04-16 11:39:44 UTC (rev 260177)
@@ -73,7 +73,7 @@
const WebCore::IntSize& size() const { return m_size; }
bool setSize(const WebCore::IntSize&, const WebCore::IntSize& scrollOffset = { });
-#if !PLATFORM(COCOA)
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
// The timeout we use when waiting for a DidUpdateGeometry message.
static constexpr Seconds didUpdateBackingStoreStateTimeout() { return Seconds::fromMilliseconds(500); }
#endif
@@ -153,8 +153,9 @@
Optional<WebCore::FloatRect> m_viewExposedRect;
Optional<WebCore::FloatRect> m_lastSentViewExposedRect;
#endif // PLATFORM(MAC)
+#endif
-#else
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
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&) { }
Modified: trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in (260176 => 260177)
--- trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in 2020-04-16 11:22:51 UTC (rev 260176)
+++ trunk/Source/WebKit/UIProcess/DrawingAreaProxy.messages.in 2020-04-16 11:39:44 UTC (rev 260177)
@@ -31,7 +31,7 @@
DidUpdateGeometry()
#endif
-#if !PLATFORM(COCOA)
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
Update(uint64_t stateID, WebKit::UpdateInfo updateInfo)
DidUpdateBackingStoreState(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo, WebKit::LayerTreeContext context)
ExitAcceleratedCompositingMode(uint64_t backingStoreStateID, WebKit::UpdateInfo updateInfo)
Modified: trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h (260176 => 260177)
--- trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h 2020-04-16 11:22:51 UTC (rev 260176)
+++ trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.h 2020-04-16 11:39:44 UTC (rev 260177)
@@ -170,8 +170,10 @@
// Message handlers.
// FIXME: These should be pure virtual.
- virtual void updateBackingStoreState(uint64_t /*backingStoreStateID*/, bool /*respondImmediately*/, float /*deviceScaleFactor*/, const WebCore::IntSize& /*size*/,
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
+ virtual void updateBackingStoreState(uint64_t /*backingStoreStateID*/, bool /*respondImmediately*/, float /*deviceScaleFactor*/, const WebCore::IntSize& /*size*/,
const WebCore::IntSize& /*scrollOffset*/) { }
+#endif
virtual void didUpdate() { }
#if PLATFORM(COCOA)
Modified: trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.messages.in (260176 => 260177)
--- trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.messages.in 2020-04-16 11:22:51 UTC (rev 260176)
+++ trunk/Source/WebKit/WebProcess/WebPage/DrawingArea.messages.in 2020-04-16 11:39:44 UTC (rev 260177)
@@ -21,7 +21,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
messages -> DrawingArea NotRefCounted {
+#if USE(COORDINATED_GRAPHICS) || USE(TEXTURE_MAPPER)
UpdateBackingStoreState(uint64_t backingStoreStateID, bool respondImmediately, float deviceScaleFactor, WebCore::IntSize size, WebCore::IntSize scrollOffset)
+#endif
+
DidUpdate()
#if PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
