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

Side by Side Diff: Source/WebCore/rendering/RenderInline.cpp

Issue 10696154: Merge 120639 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1180/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderObject.h » ('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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 LayoutUnit logicalHeight = lastLineBox()->logicalBottomVisualOverflow(lastRo otBox->lineBottom()) - logicalTop; 946 LayoutUnit logicalHeight = lastLineBox()->logicalBottomVisualOverflow(lastRo otBox->lineBottom()) - logicalTop;
947 947
948 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight); 948 LayoutRect rect(logicalLeftSide, logicalTop, logicalWidth, logicalHeight);
949 if (!style()->isHorizontalWritingMode()) 949 if (!style()->isHorizontalWritingMode())
950 rect = rect.transposedRect(); 950 rect = rect.transposedRect();
951 return rect; 951 return rect;
952 } 952 }
953 953
954 LayoutRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* rep aintContainer) const 954 LayoutRect RenderInline::clippedOverflowRectForRepaint(RenderBoxModelObject* rep aintContainer) const
955 { 955 {
956 // Only run-ins and first-letter elements are allowed in here during layout. 956 // Only run-ins are allowed in here during layout.
957 ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn() || style()->sty leType() == FIRST_LETTER); 957 ASSERT(!view() || !view()->layoutStateEnabled() || isRunIn());
958 958
959 if (!firstLineBoxIncludingCulling() && !continuation()) 959 if (!firstLineBoxIncludingCulling() && !continuation())
960 return LayoutRect(); 960 return LayoutRect();
961 961
962 LayoutRect repaintRect(linesVisualOverflowBoundingBox()); 962 LayoutRect repaintRect(linesVisualOverflowBoundingBox());
963 bool hitRepaintContainer = false; 963 bool hitRepaintContainer = false;
964 964
965 // We need to add in the relative position offsets of any inlines (including us) up to our 965 // We need to add in the relative position offsets of any inlines (including us) up to our
966 // containing block. 966 // containing block.
967 RenderBlock* cb = containingBlock(); 967 RenderBlock* cb = containingBlock();
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 FloatPoint absPos = container->localToAbsolute(); 1564 FloatPoint absPos = container->localToAbsolute();
1565 region.bounds.setX(absPos.x() + region.bounds.x()); 1565 region.bounds.setX(absPos.x() + region.bounds.x());
1566 region.bounds.setY(absPos.y() + region.bounds.y()); 1566 region.bounds.setY(absPos.y() + region.bounds.y());
1567 1567
1568 regions.append(region); 1568 regions.append(region);
1569 } 1569 }
1570 } 1570 }
1571 #endif 1571 #endif
1572 1572
1573 } // namespace WebCore 1573 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | Source/WebCore/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698