Changeset 217779 in webkit
- Timestamp:
- Jun 5, 2017 5:01:53 AM (7 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 4 deleted
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r217759 r217779 1 2017-06-05 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [WPE] Use AcceleratedDrawingArea instead of its fork 4 https://bugs.webkit.org/show_bug.cgi?id=172496 5 6 Reviewed by Žan Doberšek. 7 8 WPE uses its own drawing area implementation, which is actually a fork of AcceleratedDrawingArea, but simplified 9 for the case of compositing being always forced. AcceleratedDrawingArea already handles the case of compositing 10 being forced, so now that WPE is upstream we could simply use AcceleratedDrawingArea instead. 11 12 * PlatformWPE.cmake: 13 * Shared/DrawingAreaInfo.h: Remove DrawingAreaTypeWPE type. 14 * UIProcess/API/wpe/DrawingAreaProxyWPE.cpp: Removed. 15 * UIProcess/API/wpe/DrawingAreaProxyWPE.h: Removed. 16 * UIProcess/API/wpe/PageClientImpl.cpp: 17 (WebKit::PageClientImpl::createDrawingAreaProxy): Create an AcceleratedDrawingAreaProxy. 18 * WebProcess/WebPage/AcceleratedDrawingArea.cpp: 19 (WebKit::AcceleratedDrawingArea::mainFrameContentSizeChanged): Moved from DrawingAreaImpl since it actually 20 belongs here. 21 * WebProcess/WebPage/DrawingArea.cpp: 22 (WebKit::DrawingArea::create): Create an AcceleratedDrawingArea for WPE port. 23 * WebProcess/WebPage/DrawingAreaImpl.cpp: Remove mainFrameContentSizeChanged() that doesn't belong here. 24 * WebProcess/WebPage/DrawingAreaImpl.h: 25 * WebProcess/WebPage/wpe/DrawingAreaWPE.cpp: Removed. 26 * WebProcess/WebPage/wpe/DrawingAreaWPE.h: Removed. 27 1 28 2017-06-03 Simon Fraser <simon.fraser@apple.com> 2 29 -
trunk/Source/WebKit2/PlatformWPE.cmake
r217488 r217779 91 91 Shared/wpe/WebEventFactory.cpp 92 92 93 UIProcess/AcceleratedDrawingAreaProxy.cpp 93 94 UIProcess/BackingStore.cpp 94 95 UIProcess/DefaultUndoController.cpp … … 106 107 107 108 UIProcess/API/wpe/CompositingManagerProxy.cpp 108 UIProcess/API/wpe/DrawingAreaProxyWPE.cpp109 109 UIProcess/API/wpe/PageClientImpl.cpp 110 110 UIProcess/API/wpe/ScrollGestureController.cpp … … 153 153 WebProcess/WebCoreSupport/wpe/WebPopupMenuWPE.cpp 154 154 155 WebProcess/WebPage/AcceleratedDrawingArea.cpp 155 156 WebProcess/WebPage/AcceleratedSurface.cpp 156 157 … … 165 166 WebProcess/WebPage/wpe/AcceleratedSurfaceWPE.cpp 166 167 WebProcess/WebPage/wpe/CompositingManager.cpp 167 WebProcess/WebPage/wpe/DrawingAreaWPE.cpp168 168 WebProcess/WebPage/wpe/WebInspectorUIWPE.cpp 169 169 WebProcess/WebPage/wpe/WebPageWPE.cpp -
trunk/Source/WebKit2/Shared/CoordinatedGraphics/threadedcompositor/ThreadedCompositor.cpp
r217707 r217779 183 183 void ThreadedCompositor::forceRepaint() 184 184 { 185 // FIXME: Enable this for WPE once it's possible to do these forced updates 186 // in a way that doesn't starve out the underlying graphics buffers. 187 #if PLATFORM(GTK) 185 188 m_compositingRunLoop->performTaskSync([this, protectedThis = makeRef(*this)] { 186 189 SetForScope<bool> change(m_inForceRepaint, true); 187 190 renderLayerTree(); 188 191 }); 192 #endif 189 193 } 190 194 -
trunk/Source/WebKit2/Shared/DrawingAreaInfo.h
r217488 r217779 35 35 #endif 36 36 DrawingAreaTypeRemoteLayerTree, 37 #elif PLATFORM(WPE)38 DrawingAreaTypeWPE39 37 #else 40 38 DrawingAreaTypeImpl -
trunk/Source/WebKit2/UIProcess/API/wpe/PageClientImpl.cpp
r217552 r217779 27 27 #include "PageClientImpl.h" 28 28 29 #include " DrawingAreaProxyWPE.h"29 #include "AcceleratedDrawingAreaProxy.h" 30 30 #include "NativeWebMouseEvent.h" 31 31 #include "NativeWebWheelEvent.h" … … 48 48 std::unique_ptr<DrawingAreaProxy> PageClientImpl::createDrawingAreaProxy() 49 49 { 50 return std::make_unique< DrawingAreaProxyWPE>(m_view.page());50 return std::make_unique<AcceleratedDrawingAreaProxy>(m_view.page()); 51 51 } 52 52 -
trunk/Source/WebKit2/WebProcess/WebPage/AcceleratedDrawingArea.cpp
r217488 r217779 163 163 else if (m_previousLayerTreeHost) 164 164 m_previousLayerTreeHost->sizeDidChange(size); 165 } else { 166 if (m_layerTreeHost) 167 m_layerTreeHost->contentsSizeChanged(size); 168 else if (m_previousLayerTreeHost) 169 m_previousLayerTreeHost->contentsSizeChanged(size); 165 170 } 166 171 m_webPage.mainFrame()->pageOverlayController().didChangeDocumentSize(); -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.cpp
r217488 r217779 39 39 #include "TiledCoreAnimationDrawingArea.h" 40 40 #elif PLATFORM(WPE) 41 #include " DrawingAreaWPE.h"41 #include "AcceleratedDrawingArea.h" 42 42 #else 43 43 #include "DrawingAreaImpl.h" … … 58 58 case DrawingAreaTypeRemoteLayerTree: 59 59 return std::make_unique<RemoteLayerTreeDrawingArea>(webPage, parameters); 60 #elif PLATFORM(WPE)61 case DrawingAreaTypeWPE:62 return std::make_unique<DrawingAreaWPE>(webPage, parameters);63 60 #else 64 61 case DrawingAreaTypeImpl: 62 #if PLATFORM(WPE) 63 return std::make_unique<AcceleratedDrawingArea>(webPage, parameters); 64 #else 65 65 return std::make_unique<DrawingAreaImpl>(webPage, parameters); 66 #endif 66 67 #endif 67 68 } -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.cpp
r217488 r217779 170 170 } 171 171 172 void DrawingAreaImpl::mainFrameContentSizeChanged(const WebCore::IntSize& newSize)173 {174 #if USE(COORDINATED_GRAPHICS_THREADED)175 if (m_layerTreeHost)176 m_layerTreeHost->contentsSizeChanged(newSize);177 else if (m_previousLayerTreeHost)178 m_previousLayerTreeHost->contentsSizeChanged(newSize);179 #else180 UNUSED_PARAM(newSize);181 #endif182 }183 184 172 void DrawingAreaImpl::updatePreferences(const WebPreferencesStore& store) 185 173 { -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
r217488 r217779 50 50 void forceRepaint() override; 51 51 52 void mainFrameContentSizeChanged(const WebCore::IntSize&) override;53 52 void updatePreferences(const WebPreferencesStore&) override; 54 53
Note: See TracChangeset
for help on using the changeset viewer.