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

Side by Side Diff: Source/core/html/HTMLOptionElement.h

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/HTMLOptGroupElement.cpp ('k') | Source/core/html/HTMLOptionElement.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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) 2010 Google Inc. All rights reserved. 6 * Copyright (C) 2010 Google Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 15 matching lines...) Expand all
26 #define HTMLOptionElement_h 26 #define HTMLOptionElement_h
27 27
28 #include "core/CoreExport.h" 28 #include "core/CoreExport.h"
29 #include "core/html/HTMLElement.h" 29 #include "core/html/HTMLElement.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 class ExceptionState; 33 class ExceptionState;
34 class HTMLDataListElement; 34 class HTMLDataListElement;
35 class HTMLSelectElement; 35 class HTMLSelectElement;
36 class LayoutStyle; 36 class ComputedStyle;
37 37
38 class CORE_EXPORT HTMLOptionElement final : public HTMLElement { 38 class CORE_EXPORT HTMLOptionElement final : public HTMLElement {
39 DEFINE_WRAPPERTYPEINFO(); 39 DEFINE_WRAPPERTYPEINFO();
40 public: 40 public:
41 static PassRefPtrWillBeRawPtr<HTMLOptionElement> create(Document&); 41 static PassRefPtrWillBeRawPtr<HTMLOptionElement> create(Document&);
42 static PassRefPtrWillBeRawPtr<HTMLOptionElement> createForJSConstructor(Docu ment&, const String& data, const AtomicString& value, 42 static PassRefPtrWillBeRawPtr<HTMLOptionElement> createForJSConstructor(Docu ment&, const String& data, const AtomicString& value,
43 bool defaultSelected, bool selected, ExceptionState&); 43 bool defaultSelected, bool selected, ExceptionState&);
44 44
45 String text() const; 45 String text() const;
46 void setText(const String&, ExceptionState&); 46 void setText(const String&, ExceptionState&);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 virtual void attach(const AttachContext& = AttachContext()) override; 82 virtual void attach(const AttachContext& = AttachContext()) override;
83 virtual void detach(const AttachContext& = AttachContext()) override; 83 virtual void detach(const AttachContext& = AttachContext()) override;
84 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide; 84 virtual void parseAttribute(const QualifiedName&, const AtomicString&) overr ide;
85 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override; 85 virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
86 virtual void didNotifySubtreeInsertionsToDocument() override; 86 virtual void didNotifySubtreeInsertionsToDocument() override;
87 virtual void removedFrom(ContainerNode*) override; 87 virtual void removedFrom(ContainerNode*) override;
88 virtual void accessKeyAction(bool) override; 88 virtual void accessKeyAction(bool) override;
89 virtual void childrenChanged(const ChildrenChange&) override; 89 virtual void childrenChanged(const ChildrenChange&) override;
90 90
91 // <option> never has a renderer so we manually manage a cached style. 91 // <option> never has a renderer so we manually manage a cached style.
92 void updateNonLayoutStyle(); 92 void updateNonComputedStyle();
93 virtual LayoutStyle* nonRendererStyle() const override; 93 virtual ComputedStyle* nonLayoutObjectComputedStyle() const override;
94 virtual PassRefPtr<LayoutStyle> customStyleForLayoutObject() override; 94 virtual PassRefPtr<ComputedStyle> customStyleForLayoutObject() override;
95 virtual void didRecalcStyle(StyleRecalcChange) override; 95 virtual void didRecalcStyle(StyleRecalcChange) override;
96 virtual void didAddClosedShadowRoot(ShadowRoot&) override; 96 virtual void didAddClosedShadowRoot(ShadowRoot&) override;
97 97
98 String collectOptionInnerText() const; 98 String collectOptionInnerText() const;
99 99
100 void updateLabel(); 100 void updateLabel();
101 101
102 bool m_disabled; 102 bool m_disabled;
103 bool m_isSelected; 103 bool m_isSelected;
104 RefPtr<LayoutStyle> m_style; 104 RefPtr<ComputedStyle> m_style;
105 }; 105 };
106 106
107 } // namespace blink 107 } // namespace blink
108 108
109 #endif // HTMLOptionElement_h 109 #endif // HTMLOptionElement_h
OLDNEW
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.cpp ('k') | Source/core/html/HTMLOptionElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698