Changeset 133517 in webkit
- Timestamp:
- Nov 5, 2012 1:07:33 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 46 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r133502 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 GraphicsLayers decided whether to show layer borders based 9 on a callback through the GraphicsLayerClient. This made it 10 hard to manage state, resulting in a failure to cleanly 11 hide layers when toggled off via the preference. 12 13 Changed the layer border and repaint counter visibility to be bits 14 stored on GraphicsLayer just like other properties, with getters 15 and setters. RenderLayerBacking now updates these debug 16 indicators when we update other compositing layer properties. 17 18 In GraphicsLayerCA, avoid calling updateDebugIndicators() explicitly 19 in several places by setting the change flag DebugIndicatorsChanged 20 for properties whose values affect the appearance of the debug border. 21 22 Removed the GraphicsLayerClient methods showDebugBorders() and 23 showRepaintCounter() which are no longer required. 24 25 * platform/graphics/GraphicsLayer.cpp: 26 (WebCore::GraphicsLayer::GraphicsLayer): 27 (WebCore::GraphicsLayer::updateDebugIndicators): 28 * platform/graphics/GraphicsLayer.h: 29 (WebCore::GraphicsLayer::setShowDebugBorder): 30 (WebCore::GraphicsLayer::isShowingDebugBorder): 31 (WebCore::GraphicsLayer::setShowRepaintCounter): 32 (WebCore::GraphicsLayer::isShowingRepaintCounter): 33 (WebCore::GraphicsLayer::repaintCount): 34 (WebCore::GraphicsLayer::incrementRepaintCount): 35 * platform/graphics/GraphicsLayerClient.h: 36 * platform/graphics/ca/GraphicsLayerCA.cpp: 37 (WebCore::GraphicsLayerCA::GraphicsLayerCA): 38 (WebCore::GraphicsLayerCA::setMasksToBounds): 39 (WebCore::GraphicsLayerCA::setDrawsContent): 40 (WebCore::GraphicsLayerCA::platformCALayerShowRepaintCounter): 41 (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): 42 (WebCore::GraphicsLayerCA::updateMasksToBounds): 43 (WebCore::GraphicsLayerCA::updateLayerDrawsContent): 44 (WebCore::GraphicsLayerCA::updateDebugBorder): 45 (WebCore::GraphicsLayerCA::setShowDebugBorder): 46 (WebCore::GraphicsLayerCA::setShowRepaintCounter): 47 (WebCore::GraphicsLayerCA::swapFromOrToTiledLayer): 48 (WebCore::GraphicsLayerCA::setupContentsLayer): 49 (WebCore::GraphicsLayerCA::cloneLayer): 50 * platform/graphics/ca/GraphicsLayerCA.h: 51 (GraphicsLayerCA): 52 (WebCore::GraphicsLayerCA::platformCALayerShowDebugBorders): 53 * rendering/RenderLayerBacking.cpp: 54 (WebCore::RenderLayerBacking::updateDebugIndicators): 55 * rendering/RenderLayerBacking.h: 56 (RenderLayerBacking): 57 * rendering/RenderLayerCompositor.cpp: 58 (WebCore::RenderLayerCompositor::updateBacking): 59 * rendering/RenderLayerCompositor.h: 60 (RenderLayerCompositor): 61 1 62 2012-11-05 Genevieve Mak <gmak@rim.com> 2 63 -
trunk/Source/WebCore/platform/graphics/GraphicsLayer.cpp
r133332 r133517 90 90 , m_maintainsPixelAlignment(false) 91 91 , m_appliesPageScale(false) 92 , m_showDebugBorder(false) 93 , m_showRepaintCounter(false) 92 94 , m_paintingPhase(GraphicsLayerPaintAllWithOverflowClip) 93 95 , m_contentsOrientation(CompositingCoordinatesTopDown) … … 375 377 void GraphicsLayer::updateDebugIndicators() 376 378 { 377 if (! GraphicsLayer::showDebugBorders())379 if (!isShowingDebugBorder()) 378 380 return; 379 381 -
trunk/Source/WebCore/platform/graphics/GraphicsLayer.h
r133332 r133517 353 353 virtual PlatformLayer* platformLayer() const { return 0; } 354 354 355 void dumpLayer(TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const;356 357 int repaintCount() const { return m_repaintCount; }358 int incrementRepaintCount() { return ++m_repaintCount; }359 360 355 enum CompositingCoordinatesOrientation { CompositingCoordinatesTopDown, CompositingCoordinatesBottomUp }; 361 356 … … 364 359 CompositingCoordinatesOrientation contentsOrientation() const { return m_contentsOrientation; } 365 360 366 bool showDebugBorders() const { return m_client ? m_client->showDebugBorders(this) : false; } 367 bool showRepaintCounter() const { return m_client ? m_client->showRepaintCounter(this) : false; } 368 369 void updateDebugIndicators(); 370 361 void dumpLayer(TextStream&, int indent = 0, LayerTreeAsTextBehavior = LayerTreeAsTextBehaviorNormal) const; 362 363 virtual void setShowDebugBorder(bool show) { m_showDebugBorder = show; } 364 bool isShowingDebugBorder() const { return m_showDebugBorder; } 365 366 virtual void setShowRepaintCounter(bool show) { m_showRepaintCounter = show; } 367 bool isShowingRepaintCounter() const { return m_showRepaintCounter; } 368 369 int repaintCount() const { return m_repaintCount; } 370 int incrementRepaintCount() { return ++m_repaintCount; } 371 371 372 virtual void setDebugBackgroundColor(const Color&) { } 372 373 virtual void setDebugBorder(const Color&, float /*borderWidth*/) { } 374 373 375 // z-position is the z-equivalent of position(). It's only used for debugging purposes. 374 376 virtual float zPosition() const { return m_zPosition; } … … 416 418 static void setGraphicsLayerFactory(GraphicsLayerFactoryCallback); 417 419 #endif 420 421 void updateDebugIndicators(); 418 422 419 423 protected: … … 487 491 bool m_maintainsPixelAlignment : 1; 488 492 bool m_appliesPageScale : 1; // Set for the layer which has the page scale applied to it. 489 493 bool m_showDebugBorder : 1; 494 bool m_showRepaintCounter : 1; 495 490 496 GraphicsLayerPaintingPhase m_paintingPhase; 491 497 CompositingCoordinatesOrientation m_contentsOrientation; // affects orientation of layer contents -
trunk/Source/WebCore/platform/graphics/GraphicsLayerClient.h
r133332 r133517 83 83 virtual float pageScaleFactor() const { return 1; } 84 84 85 virtual bool showDebugBorders(const GraphicsLayer*) const = 0;86 virtual bool showRepaintCounter(const GraphicsLayer*) const = 0;87 88 85 virtual bool isTrackingRepaints() const { return false; } 89 86 -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp
r133332 r133517 287 287 288 288 m_layer = PlatformCALayer::create(layerType, this); 289 290 updateDebugIndicators();291 289 noteLayerPropertyChanged(ContentsScaleChanged); 292 290 } … … 521 519 522 520 GraphicsLayer::setMasksToBounds(masksToBounds); 523 noteLayerPropertyChanged(MasksToBoundsChanged );521 noteLayerPropertyChanged(MasksToBoundsChanged | DebugIndicatorsChanged); 524 522 } 525 523 … … 530 528 531 529 GraphicsLayer::setDrawsContent(drawsContent); 532 noteLayerPropertyChanged(DrawsContentChanged );530 noteLayerPropertyChanged(DrawsContentChanged | DebugIndicatorsChanged); 533 531 } 534 532 … … 1045 1043 return false; 1046 1044 1047 return showRepaintCounter();1045 return isShowingRepaintCounter(); 1048 1046 } 1049 1047 … … 1151 1149 if (m_uncommittedChanges & AcceleratesDrawingChanged) 1152 1150 updateAcceleratesDrawing(); 1151 1152 if (m_uncommittedChanges & DebugIndicatorsChanged) 1153 updateDebugBorder(); 1153 1154 1154 1155 if (m_uncommittedChanges & ChildrenChanged) { … … 1344 1345 it->value->setMasksToBounds(m_masksToBounds); 1345 1346 } 1346 1347 updateDebugIndicators();1348 1347 } 1349 1348 … … 1529 1528 } 1530 1529 } 1531 updateDebugIndicators();1532 1530 } 1533 1531 … … 1535 1533 { 1536 1534 m_layer->setAcceleratesDrawing(m_acceleratesDrawing); 1535 } 1536 1537 void GraphicsLayerCA::updateDebugBorder() 1538 { 1539 if (isShowingDebugBorder()) 1540 updateDebugIndicators(); 1541 else 1542 m_layer->setBorderWidth(0); 1537 1543 } 1538 1544 … … 2499 2505 } 2500 2506 2507 void GraphicsLayerCA::setShowDebugBorder(bool showBorder) 2508 { 2509 if (showBorder == m_showDebugBorder) 2510 return; 2511 2512 GraphicsLayer::setShowDebugBorder(showBorder); 2513 noteLayerPropertyChanged(DebugIndicatorsChanged); 2514 } 2515 2516 void GraphicsLayerCA::setShowRepaintCounter(bool showCounter) 2517 { 2518 if (showCounter == m_showRepaintCounter) 2519 return; 2520 2521 GraphicsLayer::setShowRepaintCounter(showCounter); 2522 noteLayerPropertyChanged(DebugIndicatorsChanged); 2523 } 2524 2501 2525 void GraphicsLayerCA::setDebugBackgroundColor(const Color& color) 2502 2526 { … … 2612 2636 | ContentsScaleChanged 2613 2637 | AcceleratesDrawingChanged 2614 #if ENABLE(CSS_FILTERS)2615 2638 | FiltersChanged 2616 #endif 2617 | OpacityChanged;2639 | OpacityChanged 2640 | DebugIndicatorsChanged; 2618 2641 2619 2642 #ifndef NDEBUG … … 2627 2650 // need to tell new layer to draw itself 2628 2651 setNeedsDisplay(); 2629 2630 updateDebugIndicators();2631 2652 } 2632 2653 … … 2652 2673 contentsLayer->setAnchorPoint(FloatPoint3D()); 2653 2674 2654 if ( showDebugBorders()) {2675 if (isShowingDebugBorder()) { 2655 2676 contentsLayer->setBorderColor(Color(0, 0, 128, 180)); 2656 2677 contentsLayer->setBorderWidth(1.0f); … … 2847 2868 } 2848 2869 2849 if ( showDebugBorders()) {2870 if (isShowingDebugBorder()) { 2850 2871 newLayer->setBorderColor(Color(255, 122, 251)); 2851 2872 newLayer->setBorderWidth(2); -
trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.h
r132301 r133517 122 122 virtual bool hasContentsLayer() const { return m_contentsLayer; } 123 123 124 virtual void setShowDebugBorder(bool) OVERRIDE; 125 virtual void setShowRepaintCounter(bool) OVERRIDE; 126 124 127 virtual void setDebugBackgroundColor(const Color&); 125 128 virtual void setDebugBorder(const Color&, float borderWidth); … … 153 156 virtual CompositingCoordinatesOrientation platformCALayerContentsOrientation() const { return contentsOrientation(); } 154 157 virtual void platformCALayerPaintContents(GraphicsContext&, const IntRect& clip); 155 virtual bool platformCALayerShowDebugBorders() const { return showDebugBorders(); }158 virtual bool platformCALayerShowDebugBorders() const { return isShowingDebugBorder(); } 156 159 virtual bool platformCALayerShowRepaintCounter(PlatformCALayer*) const; 157 160 virtual int platformCALayerIncrementRepaintCount() { return incrementRepaintCount(); } … … 327 330 void updateContentsNeedsDisplay(); 328 331 void updateAcceleratesDrawing(); 332 void updateDebugBorder(); 329 333 void updateVisibleRect(const FloatRect& oldVisibleRect); 330 334 void updateContentsScale(float pixelAlignmentScale, const FloatPoint& positionRelativeToBase); … … 378 382 ContentsVisibilityChanged = 1 << 24, 379 383 VisibleRectChanged = 1 << 25, 380 #if ENABLE(CSS_FILTERS)381 384 FiltersChanged = 1 << 26, 382 #endif 385 DebugIndicatorsChanged = 1 << 27 383 386 }; 384 387 typedef unsigned LayerChangeFlags; -
trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp
r133499 r133517 849 849 m_layer->layer()->insertChild(m_contentsLayer, 0); 850 850 851 if ( showDebugBorders()) {851 if (isShowingDebugBorder()) { 852 852 m_contentsLayer->setDebugBorderColor(Color(0, 0, 128, 180).rgb()); 853 853 m_contentsLayer->setDebugBorderWidth(1); -
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperLayer.cpp
r133047 r133517 130 130 layer->paintGraphicsLayerContents(*context, dirtyRect); 131 131 132 if (layer-> showRepaintCounter()) {132 if (layer->isShowingRepaintCounter()) { 133 133 layer->incrementRepaintCount(); 134 134 drawRepaintCounter(context, layer); … … 139 139 backingStore->updateContents(textureMapper, image.get(), m_size, dirtyRect, BitmapTexture::UpdateCanModifyOriginalImageData); 140 140 141 backingStore->setShowDebugBorders(layer-> showDebugBorders());141 backingStore->setShowDebugBorders(layer->isShowingDebugBorder()); 142 142 backingStore->setDebugBorder(m_debugBorderColor, m_debugBorderWidth); 143 143 … … 618 618 619 619 static const int repaintCountBorderWidth = 10; 620 setSourceRGBAFromColor(cr, layer-> showDebugBorders() ? m_debugBorderColor : Color(0, 255, 0, 127));620 setSourceRGBAFromColor(cr, layer->isShowingDebugBorder() ? m_debugBorderColor : Color(0, 255, 0, 127)); 621 621 cairo_rectangle(cr, 0, 0, 622 622 repaintTextExtents.width + (repaintCountBorderWidth * 2), -
trunk/Source/WebCore/rendering/RenderLayerBacking.cpp
r133332 r133517 204 204 } 205 205 206 void RenderLayerBacking::updateDebugIndicators(bool showBorder, bool showRepaintCounter) 207 { 208 m_graphicsLayer->setShowDebugBorder(showBorder); 209 m_graphicsLayer->setShowRepaintCounter(showRepaintCounter); 210 211 if (m_ancestorClippingLayer) 212 m_ancestorClippingLayer->setShowDebugBorder(showBorder); 213 214 if (m_foregroundLayer) { 215 m_foregroundLayer->setShowDebugBorder(showBorder); 216 m_foregroundLayer->setShowRepaintCounter(showRepaintCounter); 217 } 218 219 if (m_maskLayer) { 220 m_maskLayer->setShowDebugBorder(showBorder); 221 m_maskLayer->setShowRepaintCounter(showRepaintCounter); 222 } 223 224 if (m_scrollingLayer) 225 m_scrollingLayer->setShowDebugBorder(showBorder); 226 227 if (m_scrollingContentsLayer) 228 m_scrollingContentsLayer->setShowDebugBorder(showBorder); 229 } 230 206 231 void RenderLayerBacking::createPrimaryGraphicsLayer() 207 232 { … … 1587 1612 } 1588 1613 1589 bool RenderLayerBacking::showDebugBorders(const GraphicsLayer*) const1590 {1591 return compositor() ? compositor()->compositorShowDebugBorders() : false;1592 }1593 1594 bool RenderLayerBacking::showRepaintCounter(const GraphicsLayer*) const1595 {1596 return compositor() ? compositor()->compositorShowRepaintCounter() : false;1597 }1598 1599 1614 bool RenderLayerBacking::isTrackingRepaints() const 1600 1615 { -
trunk/Source/WebCore/rendering/RenderLayerBacking.h
r133332 r133517 142 142 void adjustTileCacheCoverage(); 143 143 144 void updateDebugIndicators(bool showBorder, bool showRepaintCounter); 145 144 146 // GraphicsLayerClient interface 145 147 virtual bool shouldUseTileCache(const GraphicsLayer*) const OVERRIDE; … … 154 156 virtual void didCommitChangesForLayer(const GraphicsLayer*) const OVERRIDE; 155 157 virtual bool getCurrentTransform(const GraphicsLayer*, TransformationMatrix&) const OVERRIDE; 156 157 virtual bool showDebugBorders(const GraphicsLayer*) const OVERRIDE;158 virtual bool showRepaintCounter(const GraphicsLayer*) const OVERRIDE;159 158 160 159 virtual bool isTrackingRepaints() const OVERRIDE; -
trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp
r133332 r133517 584 584 scrollingCoordinator->frameViewFixedObjectsDidChange(m_renderView->frameView()); 585 585 } 586 587 if (layer->backing()) 588 layer->backing()->updateDebugIndicators(m_showDebugBorders, m_showRepaintCounter); 589 586 590 return layerChanged; 587 591 } … … 2045 2049 } 2046 2050 2047 bool RenderLayerCompositor::showDebugBorders(const GraphicsLayer* layer) const2048 {2049 if (layer == m_layerForHorizontalScrollbar || layer == m_layerForVerticalScrollbar || layer == m_layerForScrollCorner)2050 return m_showDebugBorders;2051 2052 return false;2053 }2054 2055 bool RenderLayerCompositor::showRepaintCounter(const GraphicsLayer* layer) const2056 {2057 if (layer == m_layerForHorizontalScrollbar || layer == m_layerForVerticalScrollbar || layer == m_layerForScrollCorner)2058 return m_showDebugBorders;2059 2060 return false;2061 }2062 2063 2051 bool RenderLayerCompositor::isTrackingRepaints() const 2064 2052 { -
trunk/Source/WebCore/rendering/RenderLayerCompositor.h
r133332 r133517 203 203 String layerTreeAsText(LayerTreeFlags); 204 204 205 // These are named to avoid conflicts with the functions in GraphicsLayerClient206 // These return the actual internal variables.207 bool compositorShowDebugBorders() const { return m_showDebugBorders; }208 bool compositorShowRepaintCounter() const { return m_showRepaintCounter; }209 210 205 virtual float deviceScaleFactor() const OVERRIDE; 211 206 virtual float pageScaleFactor() const OVERRIDE; … … 239 234 virtual void notifyFlushRequired(const GraphicsLayer*) OVERRIDE { scheduleLayerFlush(); } 240 235 virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect&) OVERRIDE; 241 242 virtual bool showDebugBorders(const GraphicsLayer*) const OVERRIDE;243 virtual bool showRepaintCounter(const GraphicsLayer*) const OVERRIDE;244 236 245 237 virtual bool isTrackingRepaints() const OVERRIDE; -
trunk/Source/WebKit/blackberry/Api/WebOverlay_p.h
r130439 r133517 168 168 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 169 169 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip); 170 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const { return false; }171 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const { return false; }172 170 virtual bool contentsVisible(const WebCore::GraphicsLayer*, const WebCore::IntRect& contentRect) const { return true; } 173 171 -
trunk/Source/WebKit/blackberry/Api/WebPage.cpp
r133502 r133517 5734 5734 scheduleRootLayerCommit(); 5735 5735 } 5736 5737 bool WebPagePrivate::showDebugBorders(const GraphicsLayer*) const5738 {5739 return m_page->settings()->showDebugBorders();5740 }5741 5742 bool WebPagePrivate::showRepaintCounter(const GraphicsLayer*) const5743 {5744 return m_page->settings()->showRepaintCounter();5745 }5746 5736 #endif // USE(ACCELERATED_COMPOSITING) 5747 5737 -
trunk/Source/WebKit/blackberry/Api/WebPage_p.h
r133477 r133517 402 402 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 403 403 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip) { } 404 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;405 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;406 404 407 405 // WebKit thread, plumbed through from ChromeClientBlackBerry. -
trunk/Source/WebKit/blackberry/ChangeLog
r133515 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 Remove the GraphicsLayerClient methods showDebugBorders() and 9 showRepaintCounter(). 10 11 * Api/WebOverlay_p.h: 12 (WebOverlayPrivateWebKitThread): 13 * Api/WebPage.cpp: 14 (BlackBerry::WebKit::WebPagePrivate::notifyFlushRequired): 15 * Api/WebPage_p.h: 16 * WebKitSupport/DefaultTapHighlight.cpp: 17 * WebKitSupport/DefaultTapHighlight.h: 18 (DefaultTapHighlight): 19 * WebKitSupport/InspectorOverlayBlackBerry.cpp: 20 * WebKitSupport/InspectorOverlayBlackBerry.h: 21 (InspectorOverlay): 22 * WebKitSupport/SelectionOverlay.cpp: 23 * WebKitSupport/SelectionOverlay.h: 24 (SelectionOverlay): 25 1 26 2012-11-05 Rob Buis <rbuis@rim.com> 2 27 -
trunk/Source/WebKit/blackberry/WebKitSupport/DefaultTapHighlight.cpp
r130439 r133517 149 149 } 150 150 151 bool DefaultTapHighlight::showDebugBorders(const GraphicsLayer* layer) const152 {153 return m_page->showDebugBorders(layer);154 }155 156 bool DefaultTapHighlight::showRepaintCounter(const GraphicsLayer* layer) const157 {158 return m_page->showRepaintCounter(layer);159 }160 161 151 bool DefaultTapHighlight::contentsVisible(const GraphicsLayer*, const IntRect& contentRect) const 162 152 { -
trunk/Source/WebKit/blackberry/WebKitSupport/DefaultTapHighlight.h
r130439 r133517 58 58 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 59 59 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip); 60 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;61 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;62 60 virtual bool contentsVisible(const WebCore::GraphicsLayer*, const WebCore::IntRect& contentRect) const; 63 61 -
trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.cpp
r130439 r133517 57 57 } 58 58 59 bool InspectorOverlay::showDebugBorders(const WebCore::GraphicsLayer* layer) const60 {61 return m_webPage->showDebugBorders(layer);62 }63 64 bool InspectorOverlay::showRepaintCounter(const WebCore::GraphicsLayer* layer) const65 {66 return m_webPage->showRepaintCounter(layer);67 }68 59 #endif 69 60 -
trunk/Source/WebKit/blackberry/WebKitSupport/InspectorOverlayBlackBerry.h
r130439 r133517 55 55 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 56 56 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip); 57 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;58 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;59 57 #endif 60 58 -
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp
r132224 r133517 118 118 } 119 119 120 bool SelectionOverlay::showDebugBorders(const GraphicsLayer* layer) const121 {122 return m_page->showDebugBorders(layer);123 }124 125 bool SelectionOverlay::showRepaintCounter(const GraphicsLayer* layer) const126 {127 return m_page->showRepaintCounter(layer);128 }129 130 120 } // namespace WebKit 131 121 } // namespace BlackBerry -
trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.h
r132224 r133517 53 53 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 54 54 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip); 55 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;56 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;57 55 58 56 private: -
trunk/Source/WebKit/chromium/ChangeLog
r133503 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 Remove the GraphicsLayerClient methods showDebugBorders() and 9 showRepaintCounter(). 10 11 * src/NonCompositedContentHost.cpp: 12 * src/NonCompositedContentHost.h: 13 (NonCompositedContentHost): 14 * src/PageOverlay.cpp: 15 * tests/GraphicsLayerChromiumTest.cpp: 16 * tests/ImageLayerChromiumTest.cpp: 17 1 18 2012-11-05 Bo Liu <boliu@chromium.org> 2 19 -
trunk/Source/WebKit/chromium/src/NonCompositedContentHost.cpp
r133499 r133517 192 192 } 193 193 194 bool NonCompositedContentHost::showDebugBorders(const WebCore::GraphicsLayer*) const195 {196 return m_showDebugBorders;197 }198 199 bool NonCompositedContentHost::showRepaintCounter(const WebCore::GraphicsLayer*) const200 {201 return false;202 }203 204 194 bool NonCompositedContentHost::isTrackingRepaints() const 205 195 { -
trunk/Source/WebKit/chromium/src/NonCompositedContentHost.h
r133499 r133517 72 72 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 73 73 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect); 74 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;75 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;76 74 virtual bool isTrackingRepaints() const; 77 75 -
trunk/Source/WebKit/chromium/src/PageOverlay.cpp
r130439 r133517 95 95 } 96 96 97 virtual bool showDebugBorders(const GraphicsLayer*) const98 {99 return m_webViewImpl->page()->settings()->showDebugBorders();100 }101 102 virtual bool showRepaintCounter(const GraphicsLayer*) const103 {104 return m_webViewImpl->page()->settings()->showRepaintCounter();105 }106 107 97 private: 108 98 OverlayGraphicsLayerClientImpl(WebViewImpl* webViewImpl, WebPageOverlay* overlay) -
trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
r131962 r133517 53 53 virtual void notifyFlushRequired(const GraphicsLayer*) OVERRIDE { } 54 54 virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) OVERRIDE { } 55 virtual bool showDebugBorders(const GraphicsLayer*) const OVERRIDE { return false; }56 virtual bool showRepaintCounter(const GraphicsLayer*) const OVERRIDE { return false; }57 55 virtual float deviceScaleFactor() const OVERRIDE { return 2; } 58 56 }; -
trunk/Source/WebKit/chromium/tests/ImageLayerChromiumTest.cpp
r130439 r133517 41 41 virtual void notifyFlushRequired(const GraphicsLayer*) { } 42 42 virtual void paintContents(const GraphicsLayer*, GraphicsContext&, GraphicsLayerPaintingPhase, const IntRect& inClip) { } 43 virtual bool showDebugBorders(const GraphicsLayer*) const { return false; }44 virtual bool showRepaintCounter(const GraphicsLayer*) const { return false; }45 43 }; 46 44 -
trunk/Source/WebKit/gtk/ChangeLog
r133389 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 Remove the GraphicsLayerClient methods showDebugBorders() and 9 showRepaintCounter(). 10 11 * WebCoreSupport/AcceleratedCompositingContext.h: 12 (AcceleratedCompositingContext): 13 * WebCoreSupport/AcceleratedCompositingContextCairo.cpp: 14 * WebCoreSupport/AcceleratedCompositingContextClutter.cpp: 15 * WebCoreSupport/AcceleratedCompositingContextGL.cpp: 16 1 17 2012-10-25 Martin Robinson <mrobinson@igalia.com> 2 18 -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContext.h
r130439 r133517 61 61 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 62 62 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& rectToPaint); 63 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;64 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;65 63 66 64 void initialize(); -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextCairo.cpp
r130439 r133517 170 170 } 171 171 172 bool AcceleratedCompositingContext::showDebugBorders(const GraphicsLayer*) const173 {174 return false;175 }176 177 bool AcceleratedCompositingContext::showRepaintCounter(const GraphicsLayer*) const178 {179 return false;180 }181 182 172 } // namespace WebKit 183 173 -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextClutter.cpp
r130439 r133517 166 166 } 167 167 168 bool AcceleratedCompositingContext::showDebugBorders(const WebCore::GraphicsLayer*) const169 {170 ASSERT_NOT_REACHED();171 return false;172 }173 174 bool AcceleratedCompositingContext::showRepaintCounter(const WebCore::GraphicsLayer*) const175 {176 ASSERT_NOT_REACHED();177 return false;178 }179 180 168 } // namespace WebKit 181 169 -
trunk/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
r130439 r133517 384 384 } 385 385 386 bool AcceleratedCompositingContext::showDebugBorders(const GraphicsLayer*) const387 {388 return false;389 }390 391 bool AcceleratedCompositingContext::showRepaintCounter(const GraphicsLayer*) const392 {393 return false;394 }395 396 386 } // namespace WebKit 397 387 -
trunk/Source/WebKit/win/ChangeLog
r132916 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 Remove the GraphicsLayerClient methods showDebugBorders() and 9 showRepaintCounter(). 10 11 * WebView.cpp: 12 * WebView.h: 13 1 14 2012-10-29 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/WebKit/win/WebView.cpp
r132916 r133517 6646 6646 } 6647 6647 6648 bool WebView::showDebugBorders(const GraphicsLayer*) const6649 {6650 return m_page->settings()->showDebugBorders();6651 }6652 6653 bool WebView::showRepaintCounter(const GraphicsLayer*) const6654 {6655 return m_page->settings()->showRepaintCounter();6656 }6657 6658 6648 void WebView::flushPendingGraphicsLayerChanges() 6659 6649 { -
trunk/Source/WebKit/win/WebView.h
r130439 r133517 1021 1021 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 1022 1022 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& inClip); 1023 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;1024 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;1025 1023 1026 1024 // CACFLayerTreeHostClient -
trunk/Source/WebKit2/ChangeLog
r133464 r133517 1 2012-11-05 Simon Fraser <simon.fraser@apple.com> 2 3 Fix layer borders to cleaning appear and disappear on switching 4 https://bugs.webkit.org/show_bug.cgi?id=101136 5 6 Reviewed by Sam Weinig. 7 8 Remove the GraphicsLayerClient methods showDebugBorders() and 9 showRepaintCounter(). 10 11 * UIProcess/CoordinatedGraphics/LayerTreeRenderer.h: 12 * WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp: 13 * WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h: 14 (LayerTreeCoordinator): 15 * WebProcess/WebPage/ca/LayerTreeHostCA.cpp: 16 * WebProcess/WebPage/ca/LayerTreeHostCA.h: 17 (LayerTreeHostCA): 18 * WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp: 19 * WebProcess/WebPage/gtk/LayerTreeHostGtk.h: 20 (LayerTreeHostGtk): 21 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h: 22 (TiledCoreAnimationDrawingArea): 23 * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm: 24 1 25 2012-11-05 Yael Aharon <yael.aharon@intel.com> 2 26 -
trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/LayerTreeRenderer.h
r133182 r133517 109 109 virtual void notifyAnimationStarted(const WebCore::GraphicsLayer*, double) { } 110 110 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) { } 111 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const { return false; }112 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const { return false; }113 111 void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect&) { } 114 112 void updateViewport(); -
trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.cpp
r133270 r133517 579 579 } 580 580 581 bool LayerTreeCoordinator::showDebugBorders(const WebCore::GraphicsLayer*) const582 {583 return m_webPage->corePage()->settings()->showDebugBorders();584 }585 586 bool LayerTreeCoordinator::showRepaintCounter(const WebCore::GraphicsLayer*) const587 {588 return m_webPage->corePage()->settings()->showRepaintCounter();589 }590 591 581 PassOwnPtr<GraphicsLayer> LayerTreeCoordinator::createGraphicsLayer(GraphicsLayerClient* client) 592 582 { -
trunk/Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/LayerTreeCoordinator.h
r133270 r133517 113 113 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 114 114 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect); 115 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;116 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;117 115 118 116 // GraphicsLayerFactory -
trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp
r130439 r133517 204 204 } 205 205 206 bool LayerTreeHostCA::showDebugBorders(const GraphicsLayer*) const207 {208 return m_webPage->corePage()->settings()->showDebugBorders();209 }210 211 bool LayerTreeHostCA::showRepaintCounter(const GraphicsLayer*) const212 {213 return m_webPage->corePage()->settings()->showRepaintCounter();214 }215 216 206 float LayerTreeHostCA::deviceScaleFactor() const 217 207 { -
trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.h
r130439 r133517 77 77 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 78 78 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect); 79 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;80 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;81 79 virtual float deviceScaleFactor() const; 82 80 virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const { } -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
r130525 r133517 259 259 } 260 260 261 bool LayerTreeHostGtk::showDebugBorders(const GraphicsLayer*) const262 {263 return m_webPage->corePage()->settings()->showDebugBorders();264 }265 266 bool LayerTreeHostGtk::showRepaintCounter(const GraphicsLayer*) const267 {268 return m_webPage->corePage()->settings()->showRepaintCounter();269 }270 271 261 gboolean LayerTreeHostGtk::layerFlushTimerFiredCallback(LayerTreeHostGtk* layerTreeHost) 272 262 { -
trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
r130439 r133517 78 78 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*); 79 79 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect); 80 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const;81 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const;82 80 virtual void didCommitChangesForLayer(const WebCore::GraphicsLayer*) const { } 83 81 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h
r130439 r133517 73 73 virtual void notifyFlushRequired(const WebCore::GraphicsLayer*) OVERRIDE; 74 74 virtual void paintContents(const WebCore::GraphicsLayer*, WebCore::GraphicsContext&, WebCore::GraphicsLayerPaintingPhase, const WebCore::IntRect& clipRect) OVERRIDE; 75 virtual bool showDebugBorders(const WebCore::GraphicsLayer*) const OVERRIDE;76 virtual bool showRepaintCounter(const WebCore::GraphicsLayer*) const OVERRIDE;77 75 virtual float deviceScaleFactor() const OVERRIDE; 78 76 -
trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm
r130441 r133517 274 274 } 275 275 276 bool TiledCoreAnimationDrawingArea::showDebugBorders(const GraphicsLayer*) const277 {278 return m_webPage->corePage()->settings()->showDebugBorders();279 }280 281 bool TiledCoreAnimationDrawingArea::showRepaintCounter(const GraphicsLayer*) const282 {283 return m_webPage->corePage()->settings()->showRepaintCounter();284 }285 286 276 float TiledCoreAnimationDrawingArea::deviceScaleFactor() const 287 277 {
Note: See TracChangeset
for help on using the changeset viewer.