Changeset 140774 in webkit
- Timestamp:
- Jan 24, 2013 8:57:00 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r140716 r140774 1 2013-01-24 James Robinson <jamesr@chromium.org> 2 3 [chromium] Remove dead transitional code from WebViewImpl 4 https://bugs.webkit.org/show_bug.cgi?id=107889 5 6 Reviewed by Adrienne Walker. 7 8 The chromium side of this landed at r178256 and seems stable. 9 10 * public/WebWidget.h: 11 (WebKit::WebWidget::setCompositorSurfaceReady): 12 * src/WebViewImpl.cpp: 13 (WebKit::WebViewImpl::WebViewImpl): 14 (WebKit::WebViewImpl::~WebViewImpl): 15 (WebKit): 16 (WebKit::WebViewImpl::setIsTransparent): 17 (WebKit::WebViewImpl::setIsAcceleratedCompositingActive): 18 * src/WebViewImpl.h: 19 1 20 2013-01-24 James Robinson <jamesr@chromium.org> 2 21 -
trunk/Source/WebKit/chromium/public/WebWidget.h
r140621 r140774 130 130 // Indicates that the compositing surface associated with this WebWidget is 131 131 // ready to use. 132 virtual void setCompositorSurfaceReady() = 0;132 virtual void setCompositorSurfaceReady() { } 133 133 134 134 // Temporary method for the embedder to notify the WebWidget that the widget … … 136 136 // removed when the WebWidget inversion patch lands --- http://crbug.com/112837 137 137 virtual void setNeedsRedraw() { } 138 139 // Temporary method for the embedder to check for throttled input. When this140 // is true, the WebWidget is indicating that it would prefer to not receive141 // additional input events until142 // WebWidgetClient::didBecomeReadyForAdditionalInput is called.143 //144 // This method will be removed when the WebWidget inversion patch lands ---145 // http://crbug.com/112837146 virtual bool isInputThrottled() const { return false; }147 138 148 139 // Called to inform the WebWidget of a change in theme. … … 248 239 virtual void instrumentCancelFrame() { } 249 240 250 // Fills in a WebRenderingStats struct containing information about rendering, e.g. count of frames rendered, time spent painting.251 // This call is relatively expensive in threaded compositing mode, as it blocks on the compositor thread.252 // It is safe to call in software mode, but will only give stats for rendering done in compositing mode.253 virtual void renderingStats(WebRenderingStats&) const { }254 255 241 // The page background color. Can be used for filling in areas without 256 242 // content. -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r140716 r140774 419 419 #if USE(ACCELERATED_COMPOSITING) 420 420 , m_layerTreeView(0) 421 , m_ownsLayerTreeView(false)422 421 , m_rootLayer(0) 423 422 , m_rootGraphicsLayer(0) … … 426 425 , m_compositorCreationFailed(false) 427 426 , m_recreatingGraphicsContext(false) 428 , m_compositorSurfaceReady(false)429 427 , m_inputHandlerIdentifier(-1) 430 428 #endif … … 512 510 WebViewImpl::~WebViewImpl() 513 511 { 514 if (m_ownsLayerTreeView)515 delete m_layerTreeView;516 512 ASSERT(!m_page); 517 513 } … … 837 833 m_gestureAnimation = WebActiveGestureAnimation::createWithTimeOffset(curve.release(), this, parameters.startTime); 838 834 scheduleAnimation(); 839 }840 841 void WebViewImpl::renderingStats(WebRenderingStats& stats) const842 {843 if (m_layerTreeView)844 m_layerTreeView->renderingStats(stats);845 835 } 846 836 … … 1766 1756 #endif 1767 1757 1768 void WebViewImpl::setCompositorSurfaceReady()1769 {1770 m_compositorSurfaceReady = true;1771 if (m_layerTreeView)1772 m_layerTreeView->setSurfaceReady();1773 }1774 1775 1758 void WebViewImpl::animate(double) 1776 1759 { … … 1950 1933 m_layerTreeView->setNeedsRedraw(); 1951 1934 #endif 1952 }1953 1954 bool WebViewImpl::isInputThrottled() const1955 {1956 #if USE(ACCELERATED_COMPOSITING)1957 if (m_layerTreeView && isAcceleratedCompositingActive())1958 return m_layerTreeView->commitRequested();1959 #endif1960 return false;1961 1935 } 1962 1936 … … 3597 3571 if (m_nonCompositedContentHost) 3598 3572 m_nonCompositedContentHost->setOpaque(!isTransparent); 3599 3600 if (m_layerTreeView)3601 m_layerTreeView->setHasTransparentBackground(isTransparent);3602 3573 } 3603 3574 … … 4083 4054 m_client->initializeLayerTreeView(this, *m_rootLayer, layerTreeViewSettings); 4084 4055 m_layerTreeView = m_client->layerTreeView(); 4085 if (!m_layerTreeView) {4086 m_layerTreeView = Platform::current()->compositorSupport()->createLayerTreeView(this, *m_rootLayer, layerTreeViewSettings);4087 m_ownsLayerTreeView = true;4088 }4089 4056 if (m_layerTreeView) { 4090 4057 if (m_webSettings->applyDeviceScaleFactorInCompositor() && page()->deviceScaleFactor() != 1) … … 4094 4061 m_layerTreeView->setVisible(visible); 4095 4062 m_layerTreeView->setPageScaleFactorAndLimits(pageScaleFactor(), m_minimumPageScaleFactor, m_maximumPageScaleFactor); 4096 if (m_compositorSurfaceReady)4097 m_layerTreeView->setSurfaceReady();4098 4063 m_layerTreeView->setHasTransparentBackground(isTransparent()); 4099 4064 updateLayerTreeViewport(); -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r140286 r140774 144 144 virtual void willExitFullScreen(); 145 145 virtual void didExitFullScreen(); 146 virtual void setCompositorSurfaceReady();147 146 virtual void animate(double); 148 147 virtual void layout(); // Also implements WebLayerTreeViewClient::layout() … … 153 152 virtual void composite(bool finish); 154 153 virtual void setNeedsRedraw(); 155 virtual bool isInputThrottled() const;156 154 virtual bool handleInputEvent(const WebInputEvent&); 157 155 virtual bool hasTouchEventHandlersAt(const WebPoint&); … … 185 183 virtual void instrumentBeginFrame(); 186 184 virtual void instrumentCancelFrame(); 187 virtual void renderingStats(WebRenderingStats&) const;188 185 189 186 // WebView methods: … … 843 840 OwnPtr<NonCompositedContentHost> m_nonCompositedContentHost; 844 841 WebLayerTreeView* m_layerTreeView; 845 bool m_ownsLayerTreeView;846 842 WebLayer* m_rootLayer; 847 843 WebCore::GraphicsLayer* m_rootGraphicsLayer; … … 851 847 // If true, the graphics context is being restored. 852 848 bool m_recreatingGraphicsContext; 853 bool m_compositorSurfaceReady;854 849 int m_inputHandlerIdentifier; 855 850 #endif -
trunk/Tools/ChangeLog
r140735 r140774 1 2013-01-24 James Robinson <jamesr@chromium.org> 2 3 [chromium] Remove dead transitional code from WebViewImpl 4 https://bugs.webkit.org/show_bug.cgi?id=107889 5 6 Reviewed by Adrienne Walker. 7 8 * DumpRenderTree/chromium/WebViewHost.cpp: 9 (WebViewHost::initializeLayerTreeView): 10 (WebViewHost::setWebWidget): 11 1 12 2013-01-24 Joshua Bell <jsbell@chromium.org> 2 13 -
trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp
r140717 r140774 410 410 { 411 411 m_layerTreeView = adoptPtr(Platform::current()->compositorSupport()->createLayerTreeView(client, rootLayer, settings)); 412 if (m_layerTreeView) 413 m_layerTreeView->setSurfaceReady(); 412 414 } 413 415 … … 1121 1123 webView()->setSpellCheckClient(proxy()->spellCheckClient()); 1122 1124 webView()->setPrerendererClient(this); 1123 webView()->setCompositorSurfaceReady();1124 1125 } 1125 1126
Note: See TracChangeset
for help on using the changeset viewer.