| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2007 David Smith (catfish.man@gmail.com) | 4 * (C) 2007 David Smith (catfish.man@gmail.com) |
| 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. | 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
All rights reserved. |
| 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 Vector<ImageResource*> images; | 361 Vector<ImageResource*> images; |
| 362 appendImagesFromStyle(images, *newStyle); | 362 appendImagesFromStyle(images, *newStyle); |
| 363 if (images.isEmpty()) | 363 if (images.isEmpty()) |
| 364 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRe
nderObject(this); | 364 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->removeRe
nderObject(this); |
| 365 else | 365 else |
| 366 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende
rObject(this); | 366 ResourceLoadPriorityOptimizer::resourceLoadPriorityOptimizer()->addRende
rObject(this); |
| 367 } | 367 } |
| 368 | 368 |
| 369 void RenderBlock::invalidateTreeAfterLayout(const RenderLayerModelObject& invali
dationContainer) | 369 void RenderBlock::invalidateTreeAfterLayout(const RenderLayerModelObject& invali
dationContainer) |
| 370 { | 370 { |
| 371 if (!shouldCheckForPaintInvalidationAfterLayout()) | 371 // Note, we don't want to early out here using shouldCheckForInvalidationAft
erLayout as |
| 372 return; | 372 // we have to make sure we go through any positioned objects as they won't b
e seen in |
| 373 // the normal tree walk. |
| 373 | 374 |
| 374 RenderBox::invalidateTreeAfterLayout(invalidationContainer); | 375 if (shouldCheckForPaintInvalidationAfterLayout()) |
| 376 RenderBox::invalidateTreeAfterLayout(invalidationContainer); |
| 375 | 377 |
| 376 // Take care of positioned objects. This is required as LayoutState keeps a
single clip rect. | 378 // Take care of positioned objects. This is required as LayoutState keeps a
single clip rect. |
| 377 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects(
)) { | 379 if (TrackedRendererListHashSet* positionedObjects = this->positionedObjects(
)) { |
| 378 TrackedRendererListHashSet::iterator end = positionedObjects->end(); | 380 TrackedRendererListHashSet::iterator end = positionedObjects->end(); |
| 379 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l
ocationOffset()); | 381 LayoutStateMaintainer statePusher(*this, isTableRow() ? LayoutSize() : l
ocationOffset()); |
| 380 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin(
); it != end; ++it) { | 382 for (TrackedRendererListHashSet::iterator it = positionedObjects->begin(
); it != end; ++it) { |
| 381 RenderBox* box = *it; | 383 RenderBox* box = *it; |
| 382 | 384 |
| 383 // One of the renderers we're skipping over here may be the child's
repaint container, | 385 // One of the renderers we're skipping over here may be the child's
repaint container, |
| 384 // so we can't pass our own repaint container along. | 386 // so we can't pass our own repaint container along. |
| (...skipping 4655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5040 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 5042 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 5041 { | 5043 { |
| 5042 showRenderObject(); | 5044 showRenderObject(); |
| 5043 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 5045 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 5044 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 5046 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 5045 } | 5047 } |
| 5046 | 5048 |
| 5047 #endif | 5049 #endif |
| 5048 | 5050 |
| 5049 } // namespace WebCore | 5051 } // namespace WebCore |
| OLD | NEW |