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

Side by Side Diff: Source/WebCore/rendering/RenderBlock.h

Issue 6598044: Merge 79734 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 years, 9 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/InlineFlowBox.cpp ('k') | Source/WebCore/rendering/RenderBlock.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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // Helper methods for computing line counts and heights for line counts. 122 // Helper methods for computing line counts and heights for line counts.
123 RootInlineBox* lineAtIndex(int); 123 RootInlineBox* lineAtIndex(int);
124 int lineCount(); 124 int lineCount();
125 int heightForLineCount(int); 125 int heightForLineCount(int);
126 void clearTruncation(); 126 void clearTruncation();
127 127
128 void adjustRectForColumns(IntRect&) const; 128 void adjustRectForColumns(IntRect&) const;
129 virtual void adjustForColumns(IntSize&, const IntPoint&) const; 129 virtual void adjustForColumns(IntSize&, const IntPoint&) const;
130 130
131 void addContinuationWithOutline(RenderInline*); 131 void addContinuationWithOutline(RenderInline*);
132 bool paintsContinuationOutline(RenderInline*);
132 133
133 virtual RenderBoxModelObject* virtualContinuation() const { return continuat ion(); } 134 virtual RenderBoxModelObject* virtualContinuation() const { return continuat ion(); }
134 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); } 135 bool isAnonymousBlockContinuation() const { return continuation() && isAnony mousBlock(); }
135 RenderInline* inlineElementContinuation() const; 136 RenderInline* inlineElementContinuation() const;
136 RenderBlock* blockElementContinuation() const; 137 RenderBlock* blockElementContinuation() const;
137 138
138 using RenderBoxModelObject::continuation; 139 using RenderBoxModelObject::continuation;
139 using RenderBoxModelObject::setContinuation; 140 using RenderBoxModelObject::setContinuation;
140 141
141 // This function is a convenience helper for creating an anonymous block tha t inherits its 142 // This function is a convenience helper for creating an anonymous block tha t inherits its
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
737 ASSERT(!object || object->isRenderBlock()); 738 ASSERT(!object || object->isRenderBlock());
738 return static_cast<const RenderBlock*>(object); 739 return static_cast<const RenderBlock*>(object);
739 } 740 }
740 741
741 // This will catch anyone doing an unnecessary cast. 742 // This will catch anyone doing an unnecessary cast.
742 void toRenderBlock(const RenderBlock*); 743 void toRenderBlock(const RenderBlock*);
743 744
744 } // namespace WebCore 745 } // namespace WebCore
745 746
746 #endif // RenderBlock_h 747 #endif // RenderBlock_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/InlineFlowBox.cpp ('k') | Source/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698