WebKit Bugzilla
Attachment 342100 Details for
Bug 186374
: [CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-186374.diff (text/plain), 11.51 KB, created by
Don Olmstead
on 2018-06-06 17:56:32 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Don Olmstead
Created:
2018-06-06 17:56:32 PDT
Size:
11.51 KB
patch
obsolete
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index 2eaf26552cd..e1b14a72421 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,24 @@ >+2018-06-06 Don Olmstead <don.olmstead@sony.com> >+ >+ [CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS) >+ https://bugs.webkit.org/show_bug.cgi?id=186374 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ No new tests. No change in behavior. >+ >+ * page/scrolling/AsyncScrollingCoordinator.cpp: >+ (WebCore::AsyncScrollingCoordinator::reconcileScrollingState): >+ (WebCore::AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions): >+ * page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp: >+ * page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp: >+ * page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp: >+ * platform/PlatformWheelEvent.h: >+ * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp: >+ * platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h: >+ * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp: >+ * platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h: >+ > 2018-06-06 Antoine Quint <graouts@apple.com> > > Use the default label for snapshotted plug-ins if no mime-type is available >diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >index 0bf3197e17f..38b08260124 100644 >--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp >@@ -46,6 +46,7 @@ > #include "ScrollingStateTree.h" > #include "Settings.h" > #include "WheelEventTestTrigger.h" >+#include <wtf/ProcessID.h> > #include <wtf/text/TextStream.h> > > namespace WebCore { >@@ -369,7 +370,7 @@ void AsyncScrollingCoordinator::reconcileScrollingState(FrameView& frameView, co > bool oldProgrammaticScroll = frameView.inProgrammaticScroll(); > frameView.setInProgrammaticScroll(programmaticScroll); > >- LOG_WITH_STREAM(Scrolling, stream << getpid() << " AsyncScrollingCoordinator " << this << " reconcileScrollingState scrollPosition " << scrollPosition << " programmaticScroll " << programmaticScroll << " stability " << viewportRectStability << " " << scrollingLayerPositionAction); >+ LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator " << this << " reconcileScrollingState scrollPosition " << scrollPosition << " programmaticScroll " << programmaticScroll << " stability " << viewportRectStability << " " << scrollingLayerPositionAction); > > std::optional<FloatRect> layoutViewportRect; > >@@ -492,7 +493,7 @@ void AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions(const > if (!m_scrollingStateTree->rootStateNode()) > return; > >- LOG_WITH_STREAM(Scrolling, stream << getpid() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect); >+ LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect); > > m_scrollingStateTree->rootStateNode()->reconcileLayerPositionForViewportRect(viewportRect, action); > } >diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp >index d23f3783326..830353648ce 100644 >--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp >+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp >@@ -28,7 +28,7 @@ > #include "config.h" > #include "ScrollingCoordinatorCoordinatedGraphics.h" > >-#if USE(COORDINATED_GRAPHICS) >+#if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS) > > #include "ScrollingThread.h" > #include "ScrollingTreeCoordinatedGraphics.h" >@@ -93,4 +93,4 @@ void ScrollingCoordinatorCoordinatedGraphics::commitTreeState() > > } // namespace WebCore > >-#endif // USE(COORDINATED_GRAPHICS) >+#endif // ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS) >diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp >index 24081703eb1..22cd1ff7719 100644 >--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp >+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp >@@ -30,6 +30,8 @@ > > #if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS) > >+#include "ScrollingTree.h" >+ > namespace WebCore { > > Ref<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID) >diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp >index 25a76891423..0322e676a68 100644 >--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp >+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp >@@ -30,6 +30,8 @@ > > #if ENABLE(ASYNC_SCROLLING) && USE(COORDINATED_GRAPHICS) > >+#include "ScrollingTree.h" >+ > namespace WebCore { > > Ref<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID) >diff --git a/Source/WebCore/platform/PlatformWheelEvent.h b/Source/WebCore/platform/PlatformWheelEvent.h >index e1d2d3b3fb4..9003225610d 100644 >--- a/Source/WebCore/platform/PlatformWheelEvent.h >+++ b/Source/WebCore/platform/PlatformWheelEvent.h >@@ -48,7 +48,7 @@ enum PlatformWheelEventGranularity : uint8_t { > ScrollByPixelWheelEvent, > }; > >-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) >+#if ENABLE(ASYNC_SCROLLING) > > enum PlatformWheelEventPhase : uint8_t { > PlatformWheelEventPhaseNone = 0, >@@ -146,7 +146,7 @@ public: > bool useLatchedEventElement() const { return false; } > #endif > >-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) >+#if ENABLE(ASYNC_SCROLLING) > PlatformWheelEventPhase phase() const { return m_phase; } > PlatformWheelEventPhase momentumPhase() const { return m_momentumPhase; } > bool isEndOfNonMomentumScroll() const; >@@ -171,7 +171,7 @@ protected: > // Scrolling velocity in pixels per second. > FloatSize m_scrollingVelocity; > >-#if PLATFORM(COCOA) || PLATFORM(GTK) || PLATFORM(WPE) >+#if ENABLE(ASYNC_SCROLLING) > PlatformWheelEventPhase m_phase { PlatformWheelEventPhaseNone }; > PlatformWheelEventPhase m_momentumPhase { PlatformWheelEventPhaseNone }; > #endif >diff --git a/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp b/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp >index 64617ff30aa..b72895c58a7 100644 >--- a/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp >+++ b/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.cpp >@@ -29,6 +29,8 @@ > #include "config.h" > #include "NicosiaPaintingEngineThreaded.h" > >+#if USE(COORDINATED_GRAPHICS_THREADED) >+ > #include "GraphicsContext.h" > #include "GraphicsLayer.h" > #include "NicosiaBuffer.h" >@@ -102,3 +104,5 @@ bool PaintingEngineThreaded::paint(GraphicsLayer& layer, Ref<Buffer>&& buffer, c > } > > } // namespace Nicosia >+ >+#endif // USE(COORDINATED_GRAPHICS_THREADED) >diff --git a/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h b/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h >index 391c8cc3e28..2f1ff802aa7 100644 >--- a/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h >+++ b/Source/WebCore/platform/graphics/nicosia/NicosiaPaintingEngineThreaded.h >@@ -28,6 +28,8 @@ > > #pragma once > >+#if USE(COORDINATED_GRAPHICS_THREADED) >+ > #include "NicosiaPaintingEngine.h" > > typedef struct _GThreadPool GThreadPool; >@@ -46,3 +48,5 @@ private: > }; > > } // namespace Nicosia >+ >+#endif // USE(COORDINATED_GRAPHICS_THREADED) >diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp >index 0834988b74f..c66e4636200 100644 >--- a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp >+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.cpp >@@ -26,6 +26,8 @@ > #include "config.h" > #include "TextureMapperPlatformLayerBuffer.h" > >+#if USE(COORDINATED_GRAPHICS_THREADED) >+ > #include "NotImplemented.h" > > namespace WebCore { >@@ -80,3 +82,5 @@ void TextureMapperPlatformLayerBuffer::paintToTextureMapper(TextureMapper& textu > } > > } // namespace WebCore >+ >+#endif // USE(COORDINATED_GRAPHICS_THREADED) >diff --git a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h >index 7c8069dfde8..8b9455afef8 100644 >--- a/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h >+++ b/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h >@@ -25,13 +25,13 @@ > > #pragma once > >+#if USE(COORDINATED_GRAPHICS_THREADED) >+ > #include "BitmapTextureGL.h" > #include "TextureMapperGLHeaders.h" > #include "TextureMapperPlatformLayer.h" > #include <wtf/MonotonicTime.h> > >-#if USE(COORDINATED_GRAPHICS_THREADED) >- > namespace WebCore { > > class TextureMapperPlatformLayerBuffer : public TextureMapperPlatformLayer { >@@ -80,4 +80,4 @@ private: > > } // namespace WebCore > >-#endif // COORDINATED_GRAPHICS_THREADED >+#endif // USE(COORDINATED_GRAPHICS_THREADED) >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index 9b2ece8e41e..0fff3893b2e 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,13 @@ >+2018-06-06 Don Olmstead <don.olmstead@sony.com> >+ >+ [CoordGraphics] Fix compilation errors around USE(COORDINATED_GRAPHICS) >+ https://bugs.webkit.org/show_bug.cgi?id=186374 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ * Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp: >+ (WebKit::ThreadedCompositor::sceneUpdateFinished): >+ > 2018-06-06 Jer Noble <jer.noble@apple.com> > > REGRESSION (r232301) - Unable to enter video fullscreen >diff --git a/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp b/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp >index e721000a040..17b8de91714 100644 >--- a/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp >+++ b/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp >@@ -267,15 +267,21 @@ void ThreadedCompositor::sceneUpdateFinished() > { > LockHolder locker(m_attributes.lock); > shouldDispatchDisplayRefreshCallback = m_attributes.clientRendersNextFrame >+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) > || m_displayRefreshMonitor->requiresDisplayRefreshCallback(); >+#else >+ ; >+#endif > shouldCoordinateUpdateCompletionWithClient = m_attributes.coordinateUpdateCompletionWithClient; > } > > LockHolder stateLocker(m_compositingRunLoop->stateLock()); > >+#if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR) > // Schedule the DisplayRefreshMonitor callback, if necessary. > if (shouldDispatchDisplayRefreshCallback) > m_displayRefreshMonitor->dispatchDisplayRefreshCallback(); >+#endif > > // Mark the scene update as completed if no coordination is required and if not in a forced repaint. > if (!shouldCoordinateUpdateCompletionWithClient && !m_inForceRepaint)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 186374
: 342100