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

Side by Side Diff: third_party/WebKit/WebCore/rendering/RenderBlock.h

Issue 20076: WebKit merge 40500:40539 [WebKit side] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 10 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
OLDNEW
1 /* 1 /*
2 * This file is part of the render object implementation for KHTML. 2 * This file is part of the render object implementation for KHTML.
3 * 3 *
4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 4 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
5 * (C) 1999 Antti Koivisto (koivisto@kde.org) 5 * (C) 1999 Antti Koivisto (koivisto@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed. 7 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserv ed.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 void removePositionedObject(RenderBox*); 125 void removePositionedObject(RenderBox*);
126 void removePositionedObjects(RenderBlock*); 126 void removePositionedObjects(RenderBlock*);
127 127
128 void addPercentHeightDescendant(RenderBox*); 128 void addPercentHeightDescendant(RenderBox*);
129 static void removePercentHeightDescendant(RenderBox*); 129 static void removePercentHeightDescendant(RenderBox*);
130 130
131 virtual void positionListMarker() { } 131 virtual void positionListMarker() { }
132 132
133 virtual void borderFitAdjust(int& x, int& w) const; // Shrink the box in whi ch the border paints if border-fit is set. 133 virtual void borderFitAdjust(int& x, int& w) const; // Shrink the box in whi ch the border paints if border-fit is set.
134 134
135 virtual void updateBeforeAfterContent(RenderStyle::PseudoId pseudoId);
136
135 virtual InlineBox* createInlineBox(bool makePlaceHolderBox, bool isRootLineB ox, bool isOnlyRun=false); 137 virtual InlineBox* createInlineBox(bool makePlaceHolderBox, bool isRootLineB ox, bool isOnlyRun=false);
136 138
137 // Called to lay out the legend for a fieldset. 139 // Called to lay out the legend for a fieldset.
138 virtual RenderObject* layoutLegend(bool /*relayoutChildren*/) { return 0; } 140 virtual RenderObject* layoutLegend(bool /*relayoutChildren*/) { return 0; }
139 141
140 // the implementation of the following functions is in bidi.cpp 142 // the implementation of the following functions is in bidi.cpp
141 struct FloatWithRect { 143 struct FloatWithRect {
142 FloatWithRect(RenderBox* f) 144 FloatWithRect(RenderBox* f)
143 : object(f) 145 : object(f)
144 , rect(IntRect(f->x() - f->marginLeft(), f->y() - f->marginTop(), f- >width() + f->marginLeft() + f->marginRight(), f->height() + f->marginTop() + f- >marginBottom())) 146 , rect(IntRect(f->x() - f->marginLeft(), f->y() - f->marginTop(), f- >width() + f->marginLeft() + f->marginRight(), f->height() + f->marginTop() + f- >marginBottom()))
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
527 return static_cast<const RenderBlock*>(o); 529 return static_cast<const RenderBlock*>(o);
528 } 530 }
529 531
530 // This will catch anyone doing an unnecessary cast. 532 // This will catch anyone doing an unnecessary cast.
531 void toRenderBlock(const RenderBlock* o); 533 void toRenderBlock(const RenderBlock* o);
532 534
533 } // namespace WebCore 535 } // namespace WebCore
534 536
535 #endif // RenderBlock_h 537 #endif // RenderBlock_h
536 538
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/plugins/PluginView.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698