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

Unified Diff: third_party/WebKit/WebCore/rendering/RenderContainer.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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/WebCore/rendering/RenderContainer.h
===================================================================
--- third_party/WebKit/WebCore/rendering/RenderContainer.h (revision 9118)
+++ third_party/WebKit/WebCore/rendering/RenderContainer.h (working copy)
@@ -40,24 +40,6 @@
virtual void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = 0) { return addChild(newChild, beforeChild); }
virtual void removeChild(RenderObject*);
- virtual RenderObject* removeChildNode(RenderObject*, bool fullRemove = true);
- virtual void appendChildNode(RenderObject*, bool fullAppend = true);
- virtual void insertChildNode(RenderObject* child, RenderObject* before, bool fullInsert = true);
-
- // Designed for speed. Don't waste time doing a bunch of work like layer updating and repainting when we know that our
- // change in parentage is not going to affect anything.
- virtual void moveChildNode(RenderObject* child) { appendChildNode(child->parent()->removeChildNode(child, false), false); }
-
- virtual void calcPrefWidths() { setPrefWidthsDirty(false); }
-
- RenderObject* beforeAfterContainer(RenderStyle::PseudoId);
- virtual void updateBeforeAfterContent(RenderStyle::PseudoId);
- void updateBeforeAfterContentForContainer(RenderStyle::PseudoId, RenderContainer*);
- bool isAfterContent(RenderObject* child) const;
- virtual void invalidateCounters();
-
- virtual VisiblePosition positionForCoordinates(int x, int y);
-
virtual void addLineBoxRects(Vector<IntRect>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
virtual void collectAbsoluteLineBoxQuads(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false);
« no previous file with comments | « third_party/WebKit/WebCore/rendering/RenderButton.cpp ('k') | third_party/WebKit/WebCore/rendering/RenderContainer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698