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

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

Issue 10911116: Merge 126048 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/
Patch Set: Created 8 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
« no previous file with comments | « Source/WebCore/rendering/RenderListItem.cpp ('k') | Source/WebCore/rendering/RenderObject.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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
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 921 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 932
933 void clearLayoutRootIfNeeded() const; 933 void clearLayoutRootIfNeeded() const;
934 virtual void willBeDestroyed(); 934 virtual void willBeDestroyed();
935 void arenaDelete(RenderArena*, void* objectBase); 935 void arenaDelete(RenderArena*, void* objectBase);
936 936
937 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintCo ntainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return L ayoutRect(); } 937 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintCo ntainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return L ayoutRect(); }
938 938
939 virtual bool canBeReplacedWithInlineRunIn() const; 939 virtual bool canBeReplacedWithInlineRunIn() const;
940 940
941 virtual void insertedIntoTree(); 941 virtual void insertedIntoTree();
942 virtual void willBeRemovedFromTree();
942 943
943 private: 944 private:
944 RenderStyle* firstLineStyleSlowCase() const; 945 RenderStyle* firstLineStyleSlowCase() const;
945 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const; 946 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const;
946 947
947 Color selectionColor(int colorProperty) const; 948 Color selectionColor(int colorProperty) const;
948 949
949 #ifndef NDEBUG 950 #ifndef NDEBUG
950 void checkBlockPositionedObjectsNeedLayout(); 951 void checkBlockPositionedObjectsNeedLayout();
951 #endif 952 #endif
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
1235 // Outside the WebCore namespace for ease of invocation from gdb. 1236 // Outside the WebCore namespace for ease of invocation from gdb.
1236 void showTree(const WebCore::RenderObject*); 1237 void showTree(const WebCore::RenderObject*);
1237 void showLineTree(const WebCore::RenderObject*); 1238 void showLineTree(const WebCore::RenderObject*);
1238 void showRenderTree(const WebCore::RenderObject* object1); 1239 void showRenderTree(const WebCore::RenderObject* object1);
1239 // We don't make object2 an optional parameter so that showRenderTree 1240 // We don't make object2 an optional parameter so that showRenderTree
1240 // can be called from gdb easily. 1241 // can be called from gdb easily.
1241 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1242 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1242 #endif 1243 #endif
1243 1244
1244 #endif // RenderObject_h 1245 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderListItem.cpp ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698