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

Side by Side Diff: Source/core/html/HTMLRubyElement.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLRubyElement.h ('k') | Source/core/html/HTMLSelectElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/html/HTMLRubyElement.h" 6 #include "core/html/HTMLRubyElement.h"
7 7
8 #include "core/HTMLNames.h" 8 #include "core/HTMLNames.h"
9 #include "core/layout/LayoutRuby.h" 9 #include "core/layout/LayoutRuby.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 using namespace HTMLNames; 13 using namespace HTMLNames;
14 14
15 inline HTMLRubyElement::HTMLRubyElement(Document& document) 15 inline HTMLRubyElement::HTMLRubyElement(Document& document)
16 : HTMLElement(rubyTag, document) 16 : HTMLElement(rubyTag, document)
17 { 17 {
18 } 18 }
19 19
20 DEFINE_NODE_FACTORY(HTMLRubyElement) 20 DEFINE_NODE_FACTORY(HTMLRubyElement)
21 21
22 LayoutObject* HTMLRubyElement::createLayoutObject(const LayoutStyle& style) 22 LayoutObject* HTMLRubyElement::createLayoutObject(const ComputedStyle& style)
23 { 23 {
24 if (style.display() == INLINE) 24 if (style.display() == INLINE)
25 return new LayoutRubyAsInline(this); 25 return new LayoutRubyAsInline(this);
26 if (style.display() == BLOCK) 26 if (style.display() == BLOCK)
27 return new LayoutRubyAsBlock(this); 27 return new LayoutRubyAsBlock(this);
28 return LayoutObject::createObject(this, style); 28 return LayoutObject::createObject(this, style);
29 } 29 }
30 30
31 } 31 }
OLDNEW
« no previous file with comments | « Source/core/html/HTMLRubyElement.h ('k') | Source/core/html/HTMLSelectElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698