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

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

Issue 8017007: Merge 94582 - Style not propagated to anonymous boxes and anonymous (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 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/RenderBlock.cpp ('k') | no next file » | 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 814 matching lines...) Expand 10 before | Expand all | Expand 10 after
825 IntRect absoluteOutlineBounds() const 825 IntRect absoluteOutlineBounds() const
826 { 826 {
827 return outlineBoundsForRepaint(0); 827 return outlineBoundsForRepaint(0);
828 } 828 }
829 829
830 protected: 830 protected:
831 // Overrides should call the superclass at the end 831 // Overrides should call the superclass at the end
832 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); 832 virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
833 // Overrides should call the superclass at the start 833 // Overrides should call the superclass at the start
834 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 834 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
835 void propagateStyleToAnonymousChildren(); 835 void propagateStyleToAnonymousChildren(bool blockChildrenOnly = false);
836 836
837 void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, Bo xSide, 837 void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, Bo xSide,
838 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false); 838 Color, EBorderStyle, int adjbw1, int adjbw2, bool an tialias = false);
839 839
840 void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*); 840 void paintFocusRing(GraphicsContext*, const LayoutPoint&, RenderStyle*);
841 void paintOutline(GraphicsContext*, const LayoutRect&); 841 void paintOutline(GraphicsContext*, const LayoutRect&);
842 void addPDFURLRect(GraphicsContext*, const IntRect&); 842 void addPDFURLRect(GraphicsContext*, const IntRect&);
843 843
844 virtual IntRect viewRect() const; 844 virtual IntRect viewRect() const;
845 845
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 // Outside the WebCore namespace for ease of invocation from gdb. 1130 // Outside the WebCore namespace for ease of invocation from gdb.
1131 void showTree(const WebCore::RenderObject*); 1131 void showTree(const WebCore::RenderObject*);
1132 void showLineTree(const WebCore::RenderObject*); 1132 void showLineTree(const WebCore::RenderObject*);
1133 void showRenderTree(const WebCore::RenderObject* object1); 1133 void showRenderTree(const WebCore::RenderObject* object1);
1134 // We don't make object2 an optional parameter so that showRenderTree 1134 // We don't make object2 an optional parameter so that showRenderTree
1135 // can be called from gdb easily. 1135 // can be called from gdb easily.
1136 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1136 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1137 #endif 1137 #endif
1138 1138
1139 #endif // RenderObject_h 1139 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderBlock.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698