| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 | 375 |
| 376 LayoutPart* layoutObject = m_frame->ownerLayoutObject(); | 376 LayoutPart* layoutObject = m_frame->ownerLayoutObject(); |
| 377 if (!layoutObject) | 377 if (!layoutObject) |
| 378 return; | 378 return; |
| 379 | 379 |
| 380 IntRect paintInvalidationRect = rect; | 380 IntRect paintInvalidationRect = rect; |
| 381 paintInvalidationRect.move(layoutObject->borderLeft() + layoutObject->paddin
gLeft(), | 381 paintInvalidationRect.move(layoutObject->borderLeft() + layoutObject->paddin
gLeft(), |
| 382 layoutObject->borderTop() + layoutObject->paddingTop()); | 382 layoutObject->borderTop() + layoutObject->paddingTop()); |
| 383 // FIXME: We should not allow paint invalidation out of paint invalidation s
tate. crbug.com/457415 | 383 // FIXME: We should not allow paint invalidation out of paint invalidation s
tate. crbug.com/457415 |
| 384 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler; | 384 DisablePaintInvalidationStateAsserts paintInvalidationAssertDisabler; |
| 385 layoutObject->invalidatePaintRectangleNotInvalidatingDisplayItemClients(Layo
utRect(paintInvalidationRect)); | 385 layoutObject->invalidatePaintRectangle(LayoutRect(paintInvalidationRect)); |
| 386 } | 386 } |
| 387 | 387 |
| 388 void FrameView::setFrameRect(const IntRect& newRect) | 388 void FrameView::setFrameRect(const IntRect& newRect) |
| 389 { | 389 { |
| 390 IntRect oldRect = frameRect(); | 390 IntRect oldRect = frameRect(); |
| 391 if (newRect == oldRect) | 391 if (newRect == oldRect) |
| 392 return; | 392 return; |
| 393 | 393 |
| 394 Widget::setFrameRect(newRect); | 394 Widget::setFrameRect(newRect); |
| 395 | 395 |
| (...skipping 702 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1098 return; | 1098 return; |
| 1099 | 1099 |
| 1100 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation); | 1100 lifecycle().advanceTo(DocumentLifecycle::InPaintInvalidation); |
| 1101 | 1101 |
| 1102 RELEASE_ASSERT(!layoutViewItem().isNull()); | 1102 RELEASE_ASSERT(!layoutViewItem().isNull()); |
| 1103 LayoutViewItem rootForPaintInvalidation = layoutViewItem(); | 1103 LayoutViewItem rootForPaintInvalidation = layoutViewItem(); |
| 1104 ASSERT(!rootForPaintInvalidation.needsLayout()); | 1104 ASSERT(!rootForPaintInvalidation.needsLayout()); |
| 1105 | 1105 |
| 1106 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval
idation.debugName().ascii()); | 1106 TRACE_EVENT1("blink", "FrameView::invalidateTree", "root", rootForPaintInval
idation.debugName().ascii()); |
| 1107 | 1107 |
| 1108 invalidatePaintIfNeeded(paintInvalidationState); |
| 1108 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState); | 1109 rootForPaintInvalidation.invalidateTreeIfNeeded(paintInvalidationState); |
| 1109 invalidatePaintIfNeeded(paintInvalidationState); | |
| 1110 | 1110 |
| 1111 #if ENABLE(ASSERT) | 1111 #if ENABLE(ASSERT) |
| 1112 layoutView()->assertSubtreeClearedPaintInvalidationFlags(); | 1112 layoutView()->assertSubtreeClearedPaintInvalidationFlags(); |
| 1113 #endif | 1113 #endif |
| 1114 | 1114 |
| 1115 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean); | 1115 lifecycle().advanceTo(DocumentLifecycle::PaintInvalidationClean); |
| 1116 } | 1116 } |
| 1117 | 1117 |
| 1118 void FrameView::invalidatePaintIfNeeded(const PaintInvalidationState& paintInval
idationState) | 1118 void FrameView::invalidatePaintIfNeeded(const PaintInvalidationState& paintInval
idationState) |
| 1119 { | 1119 { |
| (...skipping 3024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4144 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); | 4144 return m_subtreeThrottled || (m_hiddenForThrottling && m_crossOriginForThrot
tling); |
| 4145 } | 4145 } |
| 4146 | 4146 |
| 4147 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const | 4147 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const |
| 4148 { | 4148 { |
| 4149 ASSERT(!layoutViewItem().isNull()); | 4149 ASSERT(!layoutViewItem().isNull()); |
| 4150 return *layoutView(); | 4150 return *layoutView(); |
| 4151 } | 4151 } |
| 4152 | 4152 |
| 4153 } // namespace blink | 4153 } // namespace blink |
| OLD | NEW |