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

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

Issue 7833032: Merge 94543 - Style not propagated to anonymous boxes and anonymous (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
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/RenderObject.cpp ('k') | Source/WebCore/rendering/RenderRuby.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 // <ruby> when used as 'display:inline' 53 // <ruby> when used as 'display:inline'
54 class RenderRubyAsInline : public RenderInline { 54 class RenderRubyAsInline : public RenderInline {
55 public: 55 public:
56 RenderRubyAsInline(Node*); 56 RenderRubyAsInline(Node*);
57 virtual ~RenderRubyAsInline(); 57 virtual ~RenderRubyAsInline();
58 58
59 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 59 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
60 virtual void removeChild(RenderObject* child); 60 virtual void removeChild(RenderObject* child);
61 61
62 protected:
63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
64
62 private: 65 private:
63 virtual bool isRuby() const { return true; } 66 virtual bool isRuby() const { return true; }
64 virtual const char* renderName() const { return "RenderRuby (inline)"; } 67 virtual const char* renderName() const { return "RenderRuby (inline)"; }
65 virtual bool createsAnonymousWrapper() const { return true; } 68 virtual bool createsAnonymousWrapper() const { return true; }
66 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); } 69 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); }
67 }; 70 };
68 71
69 // <ruby> when used as 'display:block' or 'display:inline-block' 72 // <ruby> when used as 'display:block' or 'display:inline-block'
70 class RenderRubyAsBlock : public RenderBlock { 73 class RenderRubyAsBlock : public RenderBlock {
71 public: 74 public:
72 RenderRubyAsBlock(Node*); 75 RenderRubyAsBlock(Node*);
73 virtual ~RenderRubyAsBlock(); 76 virtual ~RenderRubyAsBlock();
74 77
75 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 78 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
76 virtual void removeChild(RenderObject* child); 79 virtual void removeChild(RenderObject* child);
77 80
81 protected:
82 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
83
78 private: 84 private:
79 virtual bool isRuby() const { return true; } 85 virtual bool isRuby() const { return true; }
80 virtual const char* renderName() const { return "RenderRuby (block)"; } 86 virtual const char* renderName() const { return "RenderRuby (block)"; }
81 virtual bool createsAnonymousWrapper() const { return true; } 87 virtual bool createsAnonymousWrapper() const { return true; }
82 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); } 88 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); }
83 }; 89 };
84 90
85 } // namespace WebCore 91 } // namespace WebCore
86 92
87 #endif // RenderRuby_h 93 #endif // RenderRuby_h
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObject.cpp ('k') | Source/WebCore/rendering/RenderRuby.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698