Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: Source/WebCore/rendering/RenderLayer.cpp

Issue 11031075: Merge 130322 - [Sub-pixel layout] incorrect rendering when painting sub-layers as their own root (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 3140 matching lines...) Expand 10 before | Expand all | Expand 10 after
3151 useClipRect = !filterRenderer()->hasFilterThatMovesPixels(); 3151 useClipRect = !filterRenderer()->hasFilterThatMovesPixels();
3152 } 3152 }
3153 } 3153 }
3154 } 3154 }
3155 #endif 3155 #endif
3156 3156
3157 if (shouldPaintContent || shouldPaintOutline || isPaintingOverlayScrollbars) { 3157 if (shouldPaintContent || shouldPaintOutline || isPaintingOverlayScrollbars) {
3158 calculateRects(rootLayer, region, (localPaintFlags & PaintLayerTemporary ClipRects) ? TemporaryClipRects : PaintingClipRects, paintDirtyRect, layerBounds , damageRect, clipRectToApply, outlineRect, 3158 calculateRects(rootLayer, region, (localPaintFlags & PaintLayerTemporary ClipRects) ? TemporaryClipRects : PaintingClipRects, paintDirtyRect, layerBounds , damageRect, clipRectToApply, outlineRect,
3159 IgnoreOverlayScrollbarSize, localPaintFlags & PaintLayerPaintingOver flowContents ? IgnoreOverflowClip : RespectOverflowClip); 3159 IgnoreOverlayScrollbarSize, localPaintFlags & PaintLayerPaintingOver flowContents ? IgnoreOverflowClip : RespectOverflowClip);
3160 paintOffset = toPoint(layerBounds.location() - renderBoxLocation() + sub PixelAccumulation); 3160 paintOffset = toPoint(layerBounds.location() - renderBoxLocation() + sub PixelAccumulation);
3161 if (this == rootLayer)
3162 paintOffset = roundedIntPoint(paintOffset);
3161 } 3163 }
3162 3164
3163 bool forceBlackText = paintBehavior & PaintBehaviorForceBlackText; 3165 bool forceBlackText = paintBehavior & PaintBehaviorForceBlackText;
3164 bool selectionOnly = paintBehavior & PaintBehaviorSelectionOnly; 3166 bool selectionOnly = paintBehavior & PaintBehaviorSelectionOnly;
3165 3167
3166 // If this layer's renderer is a child of the paintingRoot, we render uncond itionally, which 3168 // If this layer's renderer is a child of the paintingRoot, we render uncond itionally, which
3167 // is done by passing a nil paintingRoot down to our renderer (as if no pain tingRoot was ever set). 3169 // is done by passing a nil paintingRoot down to our renderer (as if no pain tingRoot was ever set).
3168 // Else, our renderer tree may or may not contain the painting root, so we p ass that root along 3170 // Else, our renderer tree may or may not contain the painting root, so we p ass that root along
3169 // so it will be tested against as we descend through the renderers. 3171 // so it will be tested against as we descend through the renderers.
3170 RenderObject* paintingRootForRenderer = 0; 3172 RenderObject* paintingRootForRenderer = 0;
(...skipping 1899 matching lines...) Expand 10 before | Expand all | Expand 10 after
5070 } 5072 }
5071 } 5073 }
5072 5074
5073 void showLayerTree(const WebCore::RenderObject* renderer) 5075 void showLayerTree(const WebCore::RenderObject* renderer)
5074 { 5076 {
5075 if (!renderer) 5077 if (!renderer)
5076 return; 5078 return;
5077 showLayerTree(renderer->enclosingLayer()); 5079 showLayerTree(renderer->enclosingLayer());
5078 } 5080 }
5079 #endif 5081 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698