Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2009, Google Inc. All rights reserved. | 2 * Copyright (c) 2009, Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 return false; | 117 return false; |
| 118 } | 118 } |
| 119 | 119 |
| 120 // The SVG addFocusRingRects() method adds rects in local coordinates so the def ault absoluteFocusRingQuads | 120 // The SVG addFocusRingRects() method adds rects in local coordinates so the def ault absoluteFocusRingQuads |
| 121 // returns incorrect values for SVG objects. Overriding this method provides acc ess to the absolute bounds. | 121 // returns incorrect values for SVG objects. Overriding this method provides acc ess to the absolute bounds. |
| 122 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads) | 122 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads) |
| 123 { | 123 { |
| 124 quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())) ); | 124 quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())) ); |
| 125 } | 125 } |
| 126 | 126 |
| 127 void RenderSVGModelObject::repaintTreeAfterLayout() | 127 void RenderSVGModelObject::repaintTreeAfterLayout(RenderLayerModelObject& repain tContainer) |
|
Julien - ping for review
2014/05/07 17:50:03
This should be a const RenderLayerModelObject& as
| |
| 128 { | 128 { |
| 129 // Note: This is a reduced version of RenderBox::repaintTreeAfterLayout(). | 129 // Note: This is a reduced version of RenderBox::repaintTreeAfterLayout(). |
| 130 // FIXME: Should share code with RenderBox::repaintTreeAfterLayout(). | 130 // FIXME: Should share code with RenderBox::repaintTreeAfterLayout(). |
| 131 LayoutStateDisabler layoutStateDisabler(*this); | 131 LayoutStateDisabler layoutStateDisabler(*this); |
| 132 | 132 |
| 133 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); | 133 ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled()); |
| 134 ASSERT(!needsLayout()); | 134 ASSERT(!needsLayout()); |
| 135 | 135 |
| 136 const LayoutRect oldRepaintRect = previousRepaintRect(); | 136 const LayoutRect oldRepaintRect = previousRepaintRect(); |
| 137 const LayoutPoint oldPositionFromRepaintContainer = previousPositionFromRepa intContainer(); | 137 const LayoutPoint oldPositionFromRepaintContainer = previousPositionFromRepa intContainer(); |
| 138 RenderLayerModelObject* repaintContainer = containerForRepaint(); | 138 RenderLayerModelObject& newRepaintContainer = *containerForRepaint(); |
| 139 setPreviousRepaintRect(clippedOverflowRectForRepaint(repaintContainer)); | 139 setPreviousRepaintRect(clippedOverflowRectForRepaint(&newRepaintContainer)); |
| 140 setPreviousPositionFromRepaintContainer(positionFromRepaintContainer(repaint Container)); | 140 setPreviousPositionFromRepaintContainer(positionFromRepaintContainer(&newRep aintContainer)); |
|
Julien - ping for review
2014/05/07 17:50:03
It really looks like clippedOverflowrectForRepaint
leviw_travelin_and_unemployed
2014/05/07 17:58:48
There's one exception to this. absoluteClippedOver
| |
| 141 | 141 |
| 142 // If we are set to do a full repaint that means the RenderView will be | 142 // If we are set to do a full repaint that means the RenderView will be |
| 143 // invalidated. We can then skip issuing of invalidations for the child | 143 // invalidated. We can then skip issuing of invalidations for the child |
| 144 // renderers as they'll be covered by the RenderView. | 144 // renderers as they'll be covered by the RenderView. |
| 145 if (view()->doingFullRepaint()) { | 145 if (view()->doingFullRepaint()) { |
| 146 RenderObject::repaintTreeAfterLayout(); | 146 RenderObject::repaintTreeAfterLayout(newRepaintContainer); |
| 147 return; | 147 return; |
| 148 } | 148 } |
| 149 | 149 |
| 150 const LayoutRect& newRepaintRect = previousRepaintRect(); | 150 const LayoutRect& newRepaintRect = previousRepaintRect(); |
| 151 const LayoutPoint& newPositionFromRepaintContainer = previousPositionFromRep aintContainer(); | 151 const LayoutPoint& newPositionFromRepaintContainer = previousPositionFromRep aintContainer(); |
| 152 repaintAfterLayoutIfNeeded(containerForRepaint(), | 152 repaintAfterLayoutIfNeeded(containerForRepaint(), |
| 153 shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldPositionFromRepaint Container, &newRepaintRect, &newPositionFromRepaintContainer); | 153 shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldPositionFromRepaint Container, &newRepaintRect, &newPositionFromRepaintContainer); |
| 154 | 154 |
| 155 RenderObject::repaintTreeAfterLayout(); | 155 RenderObject::repaintTreeAfterLayout(newRepaintContainer); |
| 156 } | 156 } |
| 157 | 157 |
| 158 } // namespace WebCore | 158 } // namespace WebCore |
| OLD | NEW |