| 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 472 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset, contentsC
lipBehavior); | 472 bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset, contentsC
lipBehavior); |
| 473 { | 473 { |
| 474 paintObject(paintInfo, adjustedPaintOffset); | 474 paintObject(paintInfo, adjustedPaintOffset); |
| 475 } | 475 } |
| 476 if (pushedClip) | 476 if (pushedClip) |
| 477 popContentsClip(paintInfo, phase, adjustedPaintOffset); | 477 popContentsClip(paintInfo, phase, adjustedPaintOffset); |
| 478 } | 478 } |
| 479 | 479 |
| 480 void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOf
fset) | 480 void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOf
fset) |
| 481 { | 481 { |
| 482 // We don't paint our own background, but we do let the kids paint their bac
kgrounds. | 482 // FIXME(sky): Can we remove paintContents and just keep paintChildren? |
| 483 PaintInfo paintInfoForChild(paintInfo); | 483 paintChildren(paintInfo, paintOffset); |
| 484 paintInfoForChild.updatePaintingRootForChildren(this); | |
| 485 paintChildren(paintInfoForChild, paintOffset); | |
| 486 } | 484 } |
| 487 | 485 |
| 488 void RenderBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOf
fset) | 486 void RenderBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOf
fset) |
| 489 { | 487 { |
| 490 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBo
x()) | 488 for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBo
x()) |
| 491 paintChild(child, paintInfo, paintOffset); | 489 paintChild(child, paintInfo, paintOffset); |
| 492 } | 490 } |
| 493 | 491 |
| 494 void RenderBlock::paintChild(RenderBox* child, PaintInfo& paintInfo, const Layou
tPoint& paintOffset) | 492 void RenderBlock::paintChild(RenderBox* child, PaintInfo& paintInfo, const Layou
tPoint& paintOffset) |
| 495 { | 493 { |
| (...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1823 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 1821 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 1824 { | 1822 { |
| 1825 showRenderObject(); | 1823 showRenderObject(); |
| 1826 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 1824 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 1827 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 1825 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 1828 } | 1826 } |
| 1829 | 1827 |
| 1830 #endif | 1828 #endif |
| 1831 | 1829 |
| 1832 } // namespace blink | 1830 } // namespace blink |
| OLD | NEW |