| 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 2872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2883 // FIXME: This is wrong for block-flows that are horizontal. | 2883 // FIXME: This is wrong for block-flows that are horizontal. |
| 2884 // https://bugs.webkit.org/show_bug.cgi?id=46781 | 2884 // https://bugs.webkit.org/show_bug.cgi?id=46781 |
| 2885 rects.append(pixelSnappedIntRect(accumulatedOffset.x(), accumulatedOffse
t.y() - collapsedMarginBefore(), | 2885 rects.append(pixelSnappedIntRect(accumulatedOffset.x(), accumulatedOffse
t.y() - collapsedMarginBefore(), |
| 2886 width(), height() + collapsedMarginBefore() + co
llapsedMarginAfter())); | 2886 width(), height() + collapsedMarginBefore() + co
llapsedMarginAfter())); |
| 2887 continuation()->absoluteRects(rects, accumulatedOffset - toLayoutSize(lo
cation() + | 2887 continuation()->absoluteRects(rects, accumulatedOffset - toLayoutSize(lo
cation() + |
| 2888 inlineElementContinuation()->containingBlock()->location())); | 2888 inlineElementContinuation()->containingBlock()->location())); |
| 2889 } else | 2889 } else |
| 2890 rects.append(pixelSnappedIntRect(accumulatedOffset, size())); | 2890 rects.append(pixelSnappedIntRect(accumulatedOffset, size())); |
| 2891 } | 2891 } |
| 2892 | 2892 |
| 2893 void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const | 2893 void RenderBlock::absoluteQuads(Vector<FloatQuad>& quads) const |
| 2894 { | 2894 { |
| 2895 // For blocks inside inlines, we go ahead and include margins so that we run
right up to the | 2895 // For blocks inside inlines, we go ahead and include margins so that we run
right up to the |
| 2896 // inline boxes above and below us (thus getting merged with them to form a
single irregular | 2896 // inline boxes above and below us (thus getting merged with them to form a
single irregular |
| 2897 // shape). | 2897 // shape). |
| 2898 if (isAnonymousBlockContinuation()) { | 2898 if (isAnonymousBlockContinuation()) { |
| 2899 // FIXME: This is wrong for block-flows that are horizontal. | 2899 // FIXME: This is wrong for block-flows that are horizontal. |
| 2900 // https://bugs.webkit.org/show_bug.cgi?id=46781 | 2900 // https://bugs.webkit.org/show_bug.cgi?id=46781 |
| 2901 FloatRect localRect(0, -collapsedMarginBefore().toFloat(), | 2901 FloatRect localRect(0, -collapsedMarginBefore().toFloat(), |
| 2902 width().toFloat(), (height() + collapsedMarginBefore() + collapsedMa
rginAfter()).toFloat()); | 2902 width().toFloat(), (height() + collapsedMarginBefore() + collapsedMa
rginAfter()).toFloat()); |
| 2903 quads.append(localToAbsoluteQuad(localRect, 0 /* mode */, wasFixed)); | 2903 quads.append(localToAbsoluteQuad(localRect, 0 /* mode */)); |
| 2904 continuation()->absoluteQuads(quads, wasFixed); | 2904 continuation()->absoluteQuads(quads); |
| 2905 } else { | 2905 } else { |
| 2906 quads.append(RenderBox::localToAbsoluteQuad(FloatRect(0, 0, width().toFl
oat(), height().toFloat()), 0 /* mode */, wasFixed)); | 2906 quads.append(RenderBox::localToAbsoluteQuad(FloatRect(0, 0, width().toFl
oat(), height().toFloat()), 0 /* mode */)); |
| 2907 } | 2907 } |
| 2908 } | 2908 } |
| 2909 | 2909 |
| 2910 LayoutRect RenderBlock::rectWithOutlineForPaintInvalidation(const RenderLayerMod
elObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvali
dationState* paintInvalidationState) const | 2910 LayoutRect RenderBlock::rectWithOutlineForPaintInvalidation(const RenderLayerMod
elObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvali
dationState* paintInvalidationState) const |
| 2911 { | 2911 { |
| 2912 LayoutRect r(RenderBox::rectWithOutlineForPaintInvalidation(paintInvalidatio
nContainer, outlineWidth, paintInvalidationState)); | 2912 LayoutRect r(RenderBox::rectWithOutlineForPaintInvalidation(paintInvalidatio
nContainer, outlineWidth, paintInvalidationState)); |
| 2913 if (isAnonymousBlockContinuation()) | 2913 if (isAnonymousBlockContinuation()) |
| 2914 r.inflateY(collapsedMarginBefore()); // FIXME: This is wrong for block-f
lows that are horizontal. | 2914 r.inflateY(collapsedMarginBefore()); // FIXME: This is wrong for block-f
lows that are horizontal. |
| 2915 return r; | 2915 return r; |
| 2916 } | 2916 } |
| (...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3222 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const | 3222 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m
arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render
Object* obj) const |
| 3223 { | 3223 { |
| 3224 showRenderObject(); | 3224 showRenderObject(); |
| 3225 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) | 3225 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot
Box()) |
| 3226 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); | 3226 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa
bel2, obj, 1); |
| 3227 } | 3227 } |
| 3228 | 3228 |
| 3229 #endif | 3229 #endif |
| 3230 | 3230 |
| 3231 } // namespace blink | 3231 } // namespace blink |
| OLD | NEW |