Changeset 190734 in webkit
- Timestamp:
- Oct 8, 2015 11:46:20 AM (8 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r190732 r190734 1 2015-10-08 Zalan Bujtas <zalan@apple.com> 2 3 Fallback to the RenderView when repaint container is null. 4 https://bugs.webkit.org/show_bug.cgi?id=149903 5 6 Reviewed by Simon Fraser. 7 8 Reduces code complexity at the calling sites. 9 10 No change in functionality. 11 12 * rendering/RenderObject.cpp: 13 (WebCore::RenderObject::repaintUsingContainer): 14 (WebCore::RenderObject::repaint): 15 (WebCore::RenderObject::repaintRectangle): 16 1 17 2015-10-08 Jiewen Tan <jiewen_tan@apple.com> 2 18 -
trunk/Source/WebCore/rendering/RenderObject.cpp
r190685 r190734 883 883 return; 884 884 885 if (!repaintContainer) { 886 view().repaintViewRectangle(r); 887 return; 888 } 885 if (!repaintContainer) 886 repaintContainer = &view(); 889 887 890 888 if (is<RenderFlowThread>(*repaintContainer)) { … … 898 896 } 899 897 900 RenderView& v = view();901 898 if (repaintContainer->isRenderView()) { 902 ASSERT(repaintContainer == &v); 903 bool viewHasCompositedLayer = v.isComposited(); 904 if (!viewHasCompositedLayer || v.layer()->backing()->paintsIntoWindow()) { 905 v.repaintViewRectangle(viewHasCompositedLayer && v.layer()->transform() ? LayoutRect(v.layer()->transform()->mapRect(snapRectToDevicePixels(r, document().deviceScaleFactor()))) : r); 899 RenderView& view = this->view(); 900 ASSERT(repaintContainer == &view); 901 bool viewHasCompositedLayer = view.isComposited(); 902 if (!viewHasCompositedLayer || view.layer()->backing()->paintsIntoWindow()) { 903 LayoutRect rect = r; 904 if (viewHasCompositedLayer && view.layer()->transform()) 905 rect = LayoutRect(view.layer()->transform()->mapRect(snapRectToDevicePixels(rect, document().deviceScaleFactor()))); 906 view.repaintViewRectangle(rect); 906 907 return; 907 908 } 908 909 } 909 910 910 if (v.usesCompositing()) { 911 912 if (view().usesCompositing()) { 911 913 ASSERT(repaintContainer->isComposited()); 912 914 repaintContainer->layer()->setBackingNeedsRepaintInRect(r, shouldClipToLayer ? GraphicsLayer::ClipToLayer : GraphicsLayer::DoNotClipToLayer); … … 925 927 926 928 RenderLayerModelObject* repaintContainer = containerForRepaint(); 927 repaintUsingContainer(repaintContainer ? repaintContainer : &view, clippedOverflowRectForRepaint(repaintContainer));929 repaintUsingContainer(repaintContainer, clippedOverflowRectForRepaint(repaintContainer)); 928 930 } 929 931 … … 944 946 945 947 RenderLayerModelObject* repaintContainer = containerForRepaint(); 946 repaintUsingContainer(repaintContainer ? repaintContainer : &view, computeRectForRepaint(dirtyRect, repaintContainer), shouldClipToLayer);948 repaintUsingContainer(repaintContainer, computeRectForRepaint(dirtyRect, repaintContainer), shouldClipToLayer); 947 949 } 948 950
Note: See TracChangeset
for help on using the changeset viewer.