Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org) |
| 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) | 3 * (C) 2000 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| 11 * License as published by the Free Software Foundation; either | 11 * License as published by the Free Software Foundation; either |
| 12 * version 2 of the License, or (at your option) any later version. | 12 * version 2 of the License, or (at your option) any later version. |
| 13 * | 13 * |
| 14 * This library is distributed in the hope that it will be useful, | 14 * This library is distributed in the hope that it will be useful, |
| 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 17 * Library General Public License for more details. | 17 * Library General Public License for more details. |
| 18 * | 18 * |
| 19 * You should have received a copy of the GNU Library General Public License | 19 * You should have received a copy of the GNU Library General Public License |
| 20 * along with this library; see the file COPYING.LIB. If not, write to | 20 * along with this library; see the file COPYING.LIB. If not, write to |
| 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 21 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 22 * Boston, MA 02110-1301, USA. | 22 * Boston, MA 02110-1301, USA. |
| 23 * | 23 * |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "core/rendering/LayoutRepainter.h" | 27 #include "core/rendering/LayoutRepainter.h" |
| 28 | 28 |
| 29 #include "core/rendering/RenderBlock.h" | |
| 29 #include "core/rendering/RenderLayer.h" | 30 #include "core/rendering/RenderLayer.h" |
| 30 #include "core/rendering/RenderObject.h" | 31 #include "core/rendering/RenderObject.h" |
| 31 | 32 |
| 32 namespace WebCore { | 33 namespace WebCore { |
| 33 | 34 |
| 34 LayoutRepainter::LayoutRepainter(RenderObject& object, bool checkForRepaint) | 35 LayoutRepainter::LayoutRepainter(RenderObject& object, bool checkForRepaint) |
| 35 : m_object(object) | 36 : m_object(object) |
| 36 , m_repaintContainer(0) | 37 , m_repaintContainer(0) |
| 37 , m_checkForRepaint(checkForRepaint) | 38 , m_checkForRepaint(checkForRepaint) |
| 38 { | 39 { |
| 39 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 40 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
| 40 return; | 41 return; |
| 41 | 42 |
| 42 if (m_checkForRepaint) { | 43 if (m_checkForRepaint) { |
| 43 m_repaintContainer = m_object.containerForRepaint(); | 44 m_repaintContainer = m_object.containerForRepaint(); |
| 44 { | 45 { |
| 45 // Hits in compositing/video/video-controls-layer-creation.html | 46 // Hits in compositing/video/video-controls-layer-creation.html |
| 46 DisableCompositingQueryAsserts disabler; | 47 DisableCompositingQueryAsserts disabler; |
| 47 m_oldBounds = m_object.clippedOverflowRectForRepaint(m_repaintContai ner); | 48 m_oldBounds = m_object.clippedOverflowRectForRepaint(m_repaintContai ner); |
| 48 } | 49 } |
| 49 m_oldOutlineBox = m_object.outlineBoundsForRepaint(m_repaintContainer); | 50 m_oldOutlineBox = m_object.outlineBoundsForRepaint(m_repaintContainer); |
| 50 } | 51 } |
| 51 } | 52 } |
| 52 | 53 |
| 54 bool LayoutRepainter::skipInvalidationWhenLayingOutChildren() const | |
|
eseidel
2014/03/21 00:37:09
I would have pushed this check onto the RenderObje
Julien - ping for review
2014/03/24 18:00:01
That wouldn't work currently as changing size trig
| |
| 55 { | |
| 56 if (!m_object.needsLayoutBecauseOfChildren()) | |
| 57 return false; | |
| 58 | |
| 59 // FIXME: We don't skip invalidations for SVG renderers for now. | |
|
pdr.
2014/03/21 00:25:06
This is fine, we'll never need this.
Julien - ping for review
2014/03/24 18:00:01
Done.
| |
| 60 // RenderBlock with line boxes are responsible to invalidate them so we can' t ignore them. | |
| 61 if (m_object.isSVG() || (m_object.isRenderBlock() && toRenderBlock(&m_object )->firstLineBox())) | |
| 62 return false; | |
| 63 | |
| 64 return !m_object.style()->hasVisualOverflowingEffect() && !m_object.style()- >hasBorder() && !m_object.style()->hasBackground(); | |
| 65 } | |
| 66 | |
| 53 bool LayoutRepainter::repaintAfterLayout() | 67 bool LayoutRepainter::repaintAfterLayout() |
| 54 { | 68 { |
| 55 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) | 69 if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) |
| 56 return false; | 70 return false; |
| 57 | 71 |
| 72 if (skipInvalidationWhenLayingOutChildren()) | |
| 73 return false; | |
| 74 | |
| 58 // Hits in compositing/video/video-controls-layer-creation.html | 75 // Hits in compositing/video/video-controls-layer-creation.html |
| 59 DisableCompositingQueryAsserts disabler; | 76 DisableCompositingQueryAsserts disabler; |
| 60 | 77 |
| 61 return m_checkForRepaint ? m_object.repaintAfterLayoutIfNeeded(m_repaintCont ainer, m_object.selfNeedsLayout(), m_oldBounds, m_oldOutlineBox) : false; | 78 return m_checkForRepaint ? m_object.repaintAfterLayoutIfNeeded(m_repaintCont ainer, m_object.selfNeedsLayout(), m_oldBounds, m_oldOutlineBox) : false; |
| 62 } | 79 } |
| 63 | 80 |
| 64 } // namespace WebCore | 81 } // namespace WebCore |
| OLD | NEW |