Changeset 126111 in webkit
- Timestamp:
- Aug 20, 2012 6:00:48 PM (12 years ago)
- Location:
- trunk/Source/WebKit/chromium
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r126109 r126111 1 2012-08-20 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r126095. 4 http://trac.webkit.org/changeset/126095 5 https://bugs.webkit.org/show_bug.cgi?id=94555 6 7 Breaks compilation of downstream WebWidget::paint 8 implementations (Requested by jamesr on #webkit). 9 10 * public/WebWidget.h: 11 (WebKit::WebWidget::paint): 12 * src/WebPagePopupImpl.cpp: 13 (WebKit::WebPagePopupImpl::paint): 14 * src/WebPagePopupImpl.h: 15 (WebPagePopupImpl): 16 * src/WebPopupMenuImpl.cpp: 17 (WebKit::WebPopupMenuImpl::paint): 18 * src/WebPopupMenuImpl.h: 19 * src/WebViewImpl.cpp: 20 (WebKit::WebViewImpl::paint): 21 * src/WebViewImpl.h: 22 (WebViewImpl): 23 1 24 2012-08-20 Kentaro Hara <haraken@chromium.org> 2 25 -
trunk/Source/WebKit/chromium/public/WebWidget.h
r126095 r126111 91 91 virtual void layout() { } 92 92 93 enum PaintOptions {94 // Attempt to fulfill the painting request by reading back from the95 // compositor, assuming we're using a compositor to render.96 ReadbackFromCompositorIfAvailable,97 98 // Force the widget to rerender onto the canvas using software. This99 // mode ignores 3d transforms and ignores GPU-resident content, such100 // as video, canvas, and WebGL.101 //102 // Note: This option exists on OS(ANDROID) and will hopefully be103 // removed once the link disambiguation feature renders using104 // the compositor.105 ForceSoftwareRenderingAndIgnoreGPUResidentContent,106 };107 108 93 // Called to paint the rectangular region within the WebWidget 109 94 // onto the specified canvas at (viewPort.x,viewPort.y). You MUST call … … 113 98 // processed, it should be assumed that another call to layout is 114 99 // warranted before painting again). 115 virtual void paint(WebCanvas*, const WebRect& viewPort , PaintOptions = ReadbackFromCompositorIfAvailable) { }100 virtual void paint(WebCanvas*, const WebRect& viewPort) { } 116 101 117 102 // In non-threaded compositing mode, triggers compositing of the current -
trunk/Source/WebKit/chromium/src/WebPagePopupImpl.cpp
r126095 r126111 226 226 } 227 227 228 void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect , PaintOptions)228 void WebPagePopupImpl::paint(WebCanvas* canvas, const WebRect& rect) 229 229 { 230 230 PageWidgetDelegate::paint(m_page.get(), 0, canvas, rect, PageWidgetDelegate::Opaque); -
trunk/Source/WebKit/chromium/src/WebPagePopupImpl.h
r126095 r126111 73 73 virtual void composite(bool) OVERRIDE; 74 74 virtual void layout() OVERRIDE; 75 virtual void paint(WebCanvas*, const WebRect& , PaintOptions = ReadbackFromCompositorIfAvailable) OVERRIDE;75 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; 76 76 virtual void resize(const WebSize&) OVERRIDE; 77 77 virtual void close() OVERRIDE; -
trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp
r126095 r126111 194 194 } 195 195 196 void WebPopupMenuImpl::paint(WebCanvas* canvas, const WebRect& rect , PaintOptions)196 void WebPopupMenuImpl::paint(WebCanvas* canvas, const WebRect& rect) 197 197 { 198 198 if (!m_widget) -
trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.h
r126095 r126111 74 74 virtual void animate(double frameBeginTime) OVERRIDE; 75 75 virtual void layout() OVERRIDE; 76 virtual void paint(WebCanvas*, const WebRect& , PaintOptions = ReadbackFromCompositorIfAvailable) OVERRIDE;76 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; 77 77 virtual void themeChanged() OVERRIDE; 78 78 virtual void setCompositorSurfaceReady() OVERRIDE; -
trunk/Source/WebKit/chromium/src/WebViewImpl.cpp
r126095 r126111 1687 1687 #endif 1688 1688 1689 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect, PaintOptions option) 1690 { 1691 #if !OS(ANDROID) 1692 // ReadbackFromCompositorIfAvailable is the only option available on non-Android. 1693 // Ideally, Android would always use ReadbackFromCompositorIfAvailable as well. 1694 ASSERT(option == ReadbackFromCompositorIfAvailable); 1695 #endif 1696 1697 if (option == ReadbackFromCompositorIfAvailable && isAcceleratedCompositingActive()) { 1689 void WebViewImpl::paint(WebCanvas* canvas, const WebRect& rect) 1690 { 1691 if (isAcceleratedCompositingActive()) { 1698 1692 #if USE(ACCELERATED_COMPOSITING) 1699 1693 // If a canvas was passed in, we use it to grab a copy of the … … 1707 1701 #endif 1708 1702 } else { 1709 FrameView* view = page()->mainFrame()->view();1710 PaintBehavior oldPaintBehavior = view->paintBehavior();1711 if (isAcceleratedCompositingActive()) {1712 ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent);1713 view->setPaintBehavior(oldPaintBehavior | PaintBehaviorFlattenCompositingLayers);1714 }1715 1716 1703 double paintStart = currentTime(); 1717 1704 PageWidgetDelegate::paint(m_page.get(), pageOverlays(), canvas, rect, isTransparent() ? PageWidgetDelegate::Translucent : PageWidgetDelegate::Opaque); … … 1720 1707 WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintDurationMS", (paintEnd - paintStart) * 1000, 0, 120, 30); 1721 1708 WebKit::Platform::current()->histogramCustomCounts("Renderer4.SoftwarePaintMegapixPerSecond", pixelsPerSec / 1000000, 10, 210, 30); 1722 1723 if (isAcceleratedCompositingActive()) {1724 ASSERT(option == ForceSoftwareRenderingAndIgnoreGPUResidentContent);1725 view->setPaintBehavior(oldPaintBehavior);1726 }1727 1709 } 1728 1710 } -
trunk/Source/WebKit/chromium/src/WebViewImpl.h
r126095 r126111 144 144 virtual void animate(double); 145 145 virtual void layout(); // Also implements WebLayerTreeViewClient::layout() 146 virtual void paint(WebCanvas*, const WebRect& , PaintOptions = ReadbackFromCompositorIfAvailable);146 virtual void paint(WebCanvas*, const WebRect&); 147 147 virtual void themeChanged(); 148 148 virtual void composite(bool finish);
Note: See TracChangeset
for help on using the changeset viewer.