Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: Source/core/layout/LayoutBlock.cpp

Issue 1278543002: Include the whole outline into visual overflow (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 2476 matching lines...) Expand 10 before | Expand all | Expand 10 after
2487 // https://bugs.webkit.org/show_bug.cgi?id=46781 2487 // https://bugs.webkit.org/show_bug.cgi?id=46781
2488 LayoutRect localRect(LayoutPoint(), size()); 2488 LayoutRect localRect(LayoutPoint(), size());
2489 localRect.expand(collapsedMarginBoxLogicalOutsets()); 2489 localRect.expand(collapsedMarginBoxLogicalOutsets());
2490 quads.append(localToAbsoluteQuad(FloatRect(localRect), 0 /* mode */, was Fixed)); 2490 quads.append(localToAbsoluteQuad(FloatRect(localRect), 0 /* mode */, was Fixed));
2491 continuation()->absoluteQuads(quads, wasFixed); 2491 continuation()->absoluteQuads(quads, wasFixed);
2492 } else { 2492 } else {
2493 quads.append(LayoutBox::localToAbsoluteQuad(FloatRect(0, 0, size().width ().toFloat(), size().height().toFloat()), 0 /* mode */, wasFixed)); 2493 quads.append(LayoutBox::localToAbsoluteQuad(FloatRect(0, 0, size().width ().toFloat(), size().height().toFloat()), 0 /* mode */, wasFixed));
2494 } 2494 }
2495 } 2495 }
2496 2496
2497 LayoutRect LayoutBlock::rectWithOutlineForPaintInvalidation(const LayoutBoxModel Object* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalida tionState* paintInvalidationState) const
2498 {
2499 LayoutRect r(LayoutBox::rectWithOutlineForPaintInvalidation(paintInvalidatio nContainer, outlineWidth, paintInvalidationState));
2500 if (isAnonymousBlockContinuation())
2501 r.inflateY(collapsedMarginBefore()); // FIXME: This is wrong for vertica l writing-modes.
2502 return r;
2503 }
2504
2505 LayoutObject* LayoutBlock::hoverAncestor() const 2497 LayoutObject* LayoutBlock::hoverAncestor() const
2506 { 2498 {
2507 return isAnonymousBlockContinuation() ? continuation() : LayoutBox::hoverAnc estor(); 2499 return isAnonymousBlockContinuation() ? continuation() : LayoutBox::hoverAnc estor();
2508 } 2500 }
2509 2501
2510 void LayoutBlock::updateDragState(bool dragOn) 2502 void LayoutBlock::updateDragState(bool dragOn)
2511 { 2503 {
2512 LayoutBox::updateDragState(dragOn); 2504 LayoutBox::updateDragState(dragOn);
2513 if (LayoutBoxModelObject* continuation = this->continuation()) 2505 if (LayoutBoxModelObject* continuation = this->continuation())
2514 continuation->updateDragState(dragOn); 2506 continuation->updateDragState(dragOn);
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
2914 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2906 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2915 { 2907 {
2916 showLayoutObject(); 2908 showLayoutObject();
2917 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2909 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2918 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2910 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2919 } 2911 }
2920 2912
2921 #endif 2913 #endif
2922 2914
2923 } // namespace blink 2915 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlock.h ('k') | Source/core/layout/LayoutBlockFlow.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698