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

Side by Side Diff: Source/WebCore/html/HTMLOptGroupElement.h

Issue 10453112: Merge 118772 - REGRESSION(r109729): The optgroup element's "disabled" attribute has no effect to re… (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 years, 6 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/css/StyleResolver.cpp ('k') | Source/WebCore/html/HTMLOptGroupElement.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, 2007, 2010 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2010 Apple Inc. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 16 matching lines...) Expand all
27 #include "HTMLElement.h" 27 #include "HTMLElement.h"
28 28
29 namespace WebCore { 29 namespace WebCore {
30 30
31 class HTMLSelectElement; 31 class HTMLSelectElement;
32 32
33 class HTMLOptGroupElement : public HTMLElement { 33 class HTMLOptGroupElement : public HTMLElement {
34 public: 34 public:
35 static PassRefPtr<HTMLOptGroupElement> create(const QualifiedName&, Document *); 35 static PassRefPtr<HTMLOptGroupElement> create(const QualifiedName&, Document *);
36 36
37 virtual bool disabled() const OVERRIDE;
37 HTMLSelectElement* ownerSelectElement() const; 38 HTMLSelectElement* ownerSelectElement() const;
38 39
39 String groupLabelText() const; 40 String groupLabelText() const;
40 41
41 private: 42 private:
42 HTMLOptGroupElement(const QualifiedName&, Document*); 43 HTMLOptGroupElement(const QualifiedName&, Document*);
43 44
44 virtual const AtomicString& formControlType() const; 45 virtual const AtomicString& formControlType() const;
45 virtual bool supportsFocus() const; 46 virtual bool supportsFocus() const;
46 virtual bool isFocusable() const; 47 virtual bool isFocusable() const;
48 virtual bool isEnabledFormControl() const OVERRIDE { return !disabled(); }
47 virtual void parseAttribute(Attribute*) OVERRIDE; 49 virtual void parseAttribute(Attribute*) OVERRIDE;
48 virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; } 50 virtual bool rendererIsNeeded(const NodeRenderingContext&) { return false; }
49 virtual void attach(); 51 virtual void attach();
50 virtual void detach(); 52 virtual void detach();
51 virtual void setRenderStyle(PassRefPtr<RenderStyle>); 53 virtual void setRenderStyle(PassRefPtr<RenderStyle>);
52 54
53 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0); 55 virtual void childrenChanged(bool changedByParser = false, Node* beforeChang e = 0, Node* afterChange = 0, int childCountDelta = 0);
54 56
55 virtual void accessKeyAction(bool sendMouseEvents); 57 virtual void accessKeyAction(bool sendMouseEvents);
56 58
57 virtual RenderStyle* nonRendererRenderStyle() const; 59 virtual RenderStyle* nonRendererRenderStyle() const;
58 60
59 void recalcSelectOptions(); 61 void recalcSelectOptions();
60 62
61 RefPtr<RenderStyle> m_style; 63 RefPtr<RenderStyle> m_style;
62 }; 64 };
63 65
64 } //namespace 66 } //namespace
65 67
66 #endif 68 #endif
OLDNEW
« no previous file with comments | « Source/WebCore/css/StyleResolver.cpp ('k') | Source/WebCore/html/HTMLOptGroupElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698