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

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

Issue 9564040: Merge 109406 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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/page/FrameView.h ('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 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
861 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false); 861 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false);
862 862
863 void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*); 863 void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*);
864 void paintOutline(GraphicsContext*, const LayoutRect&); 864 void paintOutline(GraphicsContext*, const LayoutRect&);
865 void addPDFURLRect(GraphicsContext*, const LayoutRect&); 865 void addPDFURLRect(GraphicsContext*, const LayoutRect&);
866 866
867 virtual LayoutRect viewRect() const; 867 virtual LayoutRect viewRect() const;
868 868
869 void adjustRectForOutlineAndShadow(LayoutRect&) const; 869 void adjustRectForOutlineAndShadow(LayoutRect&) const;
870 870
871 void clearLayoutRootIfNeeded() const;
871 virtual void willBeDestroyed(); 872 virtual void willBeDestroyed();
872 void arenaDelete(RenderArena*, void* objectBase); 873 void arenaDelete(RenderArena*, void* objectBase);
873 874
874 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintCo ntainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return L ayoutRect(); } 875 virtual LayoutRect outlineBoundsForRepaint(RenderBoxModelObject* /*repaintCo ntainer*/, LayoutPoint* /*cachedOffsetToRepaintContainer*/ = 0) const { return L ayoutRect(); }
875 876
876 private: 877 private:
877 RenderStyle* firstLineStyleSlowCase() const; 878 RenderStyle* firstLineStyleSlowCase() const;
878 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const; 879 StyleDifference adjustStyleDifference(StyleDifference, unsigned contextSensi tiveProperties) const;
879 880
880 Color selectionColor(int colorProperty) const; 881 Color selectionColor(int colorProperty) const;
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1150 // Outside the WebCore namespace for ease of invocation from gdb. 1151 // Outside the WebCore namespace for ease of invocation from gdb.
1151 void showTree(const WebCore::RenderObject*); 1152 void showTree(const WebCore::RenderObject*);
1152 void showLineTree(const WebCore::RenderObject*); 1153 void showLineTree(const WebCore::RenderObject*);
1153 void showRenderTree(const WebCore::RenderObject* object1); 1154 void showRenderTree(const WebCore::RenderObject* object1);
1154 // We don't make object2 an optional parameter so that showRenderTree 1155 // We don't make object2 an optional parameter so that showRenderTree
1155 // can be called from gdb easily. 1156 // can be called from gdb easily.
1156 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1157 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1157 #endif 1158 #endif
1158 1159
1159 #endif // RenderObject_h 1160 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.h ('k') | Source/WebCore/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698