Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (199297 => 199298)
--- trunk/Source/WebCore/CMakeLists.txt 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-11 18:49:13 UTC (rev 199298)
@@ -1609,7 +1609,6 @@
history/HistoryItem.cpp
history/PageCache.cpp
- html/AttributeDOMTokenList.cpp
html/Autofill.cpp
html/BaseButtonInputType.cpp
html/BaseCheckableInputType.cpp
Modified: trunk/Source/WebCore/ChangeLog (199297 => 199298)
--- trunk/Source/WebCore/ChangeLog 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/ChangeLog 2016-04-11 18:49:13 UTC (rev 199298)
@@ -1,5 +1,49 @@
2016-04-11 Chris Dumez <[email protected]>
+ Merge AttributedDOMTokenList into DOMTokenList
+ https://bugs.webkit.org/show_bug.cgi?id=156468
+
+ Reviewed by Ryosuke Niwa.
+
+ Merge AttributedDOMTokenList into DOMTokenList to simplify the code.
+ DOMTokenList is not constructible and AttributedDOMTokenList is its
+ only constructible subclass after r196123.
+
+ * CMakeLists.txt:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/Element.cpp:
+ (WebCore::Element::classList):
+ * dom/ElementRareData.h:
+ (WebCore::ElementRareData::classList):
+ (WebCore::ElementRareData::setClassList):
+ * html/AttributeDOMTokenList.cpp: Removed.
+ * html/AttributeDOMTokenList.h: Removed.
+ * html/DOMTokenList.cpp:
+ (WebCore::DOMTokenList::DOMTokenList):
+ (WebCore::DOMTokenList::attributeValueChanged):
+ (WebCore::DOMTokenList::updateAfterTokenChange):
+ * html/DOMTokenList.h:
+ (WebCore::DOMTokenList::ref):
+ (WebCore::DOMTokenList::deref):
+ (WebCore::DOMTokenList::element):
+ (WebCore::DOMTokenList::~DOMTokenList): Deleted.
+ (WebCore::DOMTokenList::updateAfterTokenChange): Deleted.
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::relList):
+ * html/HTMLAnchorElement.h:
+ * html/HTMLIFrameElement.cpp:
+ (WebCore::HTMLIFrameElement::sandbox):
+ * html/HTMLIFrameElement.h:
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::sizes):
+ (WebCore::HTMLLinkElement::relList):
+ * html/HTMLLinkElement.h:
+ * html/HTMLOutputElement.cpp:
+ (WebCore::HTMLOutputElement::htmlFor):
+ * html/HTMLOutputElement.h:
+
+2016-04-11 Chris Dumez <[email protected]>
+
DOMTokenList.contains() should not throw
https://bugs.webkit.org/show_bug.cgi?id=156453
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (199297 => 199298)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-04-11 18:49:13 UTC (rev 199298)
@@ -1728,8 +1728,6 @@
45BAC2B01360BBAB005DA258 /* IconURL.h in Headers */ = {isa = PBXBuildFile; fileRef = 45BAC2AF1360BBAB005DA258 /* IconURL.h */; settings = {ATTRIBUTES = (Private, ); }; };
45FEA5CF156DDE8C00654101 /* Decimal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45FEA5CD156DDE8C00654101 /* Decimal.cpp */; };
45FEA5D0156DDE8C00654101 /* Decimal.h in Headers */ = {isa = PBXBuildFile; fileRef = 45FEA5CE156DDE8C00654101 /* Decimal.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 46233EEE1BA0F187000EBEBB /* AttributeDOMTokenList.h in Headers */ = {isa = PBXBuildFile; fileRef = 46233EED1BA0F17A000EBEBB /* AttributeDOMTokenList.h */; };
- 46233EEF1BA0F18B000EBEBB /* AttributeDOMTokenList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 46233EEC1BA0F17A000EBEBB /* AttributeDOMTokenList.cpp */; };
4634592C1AC2271000ECB71C /* PowerObserverMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */; };
463EB6221B8789E00096ED51 /* TagCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 463EB6201B8789CB0096ED51 /* TagCollection.cpp */; };
463EB6231B8789E00096ED51 /* TagCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 463EB6211B8789CB0096ED51 /* TagCollection.h */; };
@@ -9249,8 +9247,6 @@
45BAC2AF1360BBAB005DA258 /* IconURL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IconURL.h; sourceTree = "<group>"; };
45FEA5CD156DDE8C00654101 /* Decimal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Decimal.cpp; sourceTree = "<group>"; };
45FEA5CE156DDE8C00654101 /* Decimal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Decimal.h; sourceTree = "<group>"; };
- 46233EEC1BA0F17A000EBEBB /* AttributeDOMTokenList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AttributeDOMTokenList.cpp; path = ../AttributeDOMTokenList.cpp; sourceTree = "<group>"; };
- 46233EED1BA0F17A000EBEBB /* AttributeDOMTokenList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AttributeDOMTokenList.h; path = ../AttributeDOMTokenList.h; sourceTree = "<group>"; };
4634592B1AC2271000ECB71C /* PowerObserverMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PowerObserverMac.cpp; sourceTree = "<group>"; };
463EB6201B8789CB0096ED51 /* TagCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TagCollection.cpp; sourceTree = "<group>"; };
463EB6211B8789CB0096ED51 /* TagCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagCollection.h; sourceTree = "<group>"; };
@@ -21164,8 +21160,6 @@
B1AD4E7713A12A7200846B27 /* track */ = {
isa = PBXGroup;
children = (
- 46233EEC1BA0F17A000EBEBB /* AttributeDOMTokenList.cpp */,
- 46233EED1BA0F17A000EBEBB /* AttributeDOMTokenList.h */,
BE88E0CC1715D2A200658D98 /* AudioTrack.cpp */,
BE88E0CD1715D2A200658D98 /* AudioTrack.h */,
BE88E0CE1715D2A200658D98 /* AudioTrack.idl */,
@@ -25024,7 +25018,6 @@
A8C4A80D09D563270003AC8D /* Attr.h in Headers */,
A8C4A80B09D563270003AC8D /* Attribute.h in Headers */,
E4A814DA1C70E10D00BF85AC /* AttributeChangeInvalidation.h in Headers */,
- 46233EEE1BA0F187000EBEBB /* AttributeDOMTokenList.h in Headers */,
FD31607A12B026F700C1A359 /* AudioArray.h in Headers */,
FD629EA3154B47160006D026 /* AudioBasicInspectorNode.h in Headers */,
FD315FF712B0267600C1A359 /* AudioBasicProcessorNode.h in Headers */,
@@ -28992,7 +28985,6 @@
0FFD4D6018651FA300512F6E /* AsyncScrollingCoordinator.cpp in Sources */,
A8C4A80E09D563270003AC8D /* Attr.cpp in Sources */,
E4A814D81C70E10500BF85AC /* AttributeChangeInvalidation.cpp in Sources */,
- 46233EEF1BA0F18B000EBEBB /* AttributeDOMTokenList.cpp in Sources */,
FD629EA4154B47160006D026 /* AudioBasicInspectorNode.cpp in Sources */,
FD315FF612B0267600C1A359 /* AudioBasicProcessorNode.cpp in Sources */,
FD315FF812B0267600C1A359 /* AudioBuffer.cpp in Sources */,
Modified: trunk/Source/WebCore/dom/Element.cpp (199297 => 199298)
--- trunk/Source/WebCore/dom/Element.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -2770,7 +2770,7 @@
{
ElementRareData& data = ""
if (!data.classList())
- data.setClassList(std::make_unique<AttributeDOMTokenList>(*this, HTMLNames::classAttr));
+ data.setClassList(std::make_unique<DOMTokenList>(*this, HTMLNames::classAttr));
return *data.classList();
}
Modified: trunk/Source/WebCore/dom/ElementRareData.h (199297 => 199298)
--- trunk/Source/WebCore/dom/ElementRareData.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/dom/ElementRareData.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -22,7 +22,7 @@
#ifndef ElementRareData_h
#define ElementRareData_h
-#include "AttributeDOMTokenList.h"
+#include "DOMTokenList.h"
#include "DatasetDOMStringMap.h"
#include "NamedNodeMap.h"
#include "NodeRareData.h"
@@ -92,8 +92,8 @@
RenderStyle* computedStyle() const { return m_computedStyle.get(); }
void setComputedStyle(Ref<RenderStyle>&& computedStyle) { m_computedStyle = WTFMove(computedStyle); }
- AttributeDOMTokenList* classList() const { return m_classList.get(); }
- void setClassList(std::unique_ptr<AttributeDOMTokenList> classList) { m_classList = WTFMove(classList); }
+ DOMTokenList* classList() const { return m_classList.get(); }
+ void setClassList(std::unique_ptr<DOMTokenList> classList) { m_classList = WTFMove(classList); }
DatasetDOMStringMap* dataset() const { return m_dataset.get(); }
void setDataset(std::unique_ptr<DatasetDOMStringMap> dataset) { m_dataset = WTFMove(dataset); }
@@ -138,7 +138,7 @@
RefPtr<RenderStyle> m_computedStyle;
std::unique_ptr<DatasetDOMStringMap> m_dataset;
- std::unique_ptr<AttributeDOMTokenList> m_classList;
+ std::unique_ptr<DOMTokenList> m_classList;
RefPtr<ShadowRoot> m_shadowRoot;
std::unique_ptr<NamedNodeMap> m_attributeMap;
Deleted: trunk/Source/WebCore/html/AttributeDOMTokenList.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/AttributeDOMTokenList.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/AttributeDOMTokenList.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "AttributeDOMTokenList.h"
-
-#include <wtf/TemporaryChange.h>
-
-namespace WebCore {
-
-AttributeDOMTokenList::AttributeDOMTokenList(Element& element, const QualifiedName& attributeName)
- : m_element(element)
- , m_attributeName(attributeName)
-{
- setValueInternal(m_element.getAttribute(m_attributeName));
-}
-
-void AttributeDOMTokenList::attributeValueChanged(const AtomicString& newValue)
-{
- // Do not reset the DOMTokenList value if the attribute value was changed by us.
- if (m_isUpdatingAttributeValue)
- return;
-
- setValueInternal(newValue);
-}
-
-void AttributeDOMTokenList::updateAfterTokenChange()
-{
- DOMTokenList::updateAfterTokenChange();
-
- TemporaryChange<bool> inAttributeUpdate(m_isUpdatingAttributeValue, true);
- m_element.setAttribute(m_attributeName, value());
-}
-
-} // namespace WebCore
Deleted: trunk/Source/WebCore/html/AttributeDOMTokenList.h (199297 => 199298)
--- trunk/Source/WebCore/html/AttributeDOMTokenList.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/AttributeDOMTokenList.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AttributeDOMTokenList_h
-#define AttributeDOMTokenList_h
-
-#include "DOMTokenList.h"
-#include "Element.h"
-
-namespace WebCore {
-
-class AttributeDOMTokenList final : public DOMTokenList {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- AttributeDOMTokenList(Element&, const QualifiedName& attributeName);
- void attributeValueChanged(const AtomicString&);
-
-private:
- void ref() override { m_element.ref(); }
- void deref() override { m_element.deref(); }
-
- Element* element() const override { return &m_element; }
- void updateAfterTokenChange() override;
-
- Element& m_element;
- const WebCore::QualifiedName& m_attributeName;
- bool m_isUpdatingAttributeValue { false };
-};
-
-} // namespace WebCore
-
-#endif // AttributeDOMTokenList_h
Modified: trunk/Source/WebCore/html/DOMTokenList.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/DOMTokenList.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/DOMTokenList.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -30,11 +30,19 @@
#include "HTMLParserIdioms.h"
#include "SpaceSplitString.h"
#include <wtf/HashSet.h>
+#include <wtf/TemporaryChange.h>
#include <wtf/text/AtomicStringHash.h>
#include <wtf/text/StringBuilder.h>
namespace WebCore {
+DOMTokenList::DOMTokenList(Element& element, const QualifiedName& attributeName)
+ : m_element(element)
+ , m_attributeName(attributeName)
+{
+ setValueInternal(m_element.getAttribute(m_attributeName));
+}
+
bool DOMTokenList::validateToken(const String& token, ExceptionCode& ec)
{
if (token.isEmpty()) {
@@ -190,4 +198,21 @@
m_cachedValue = nullAtom;
}
+void DOMTokenList::attributeValueChanged(const AtomicString& newValue)
+{
+ // Do not reset the DOMTokenList value if the attribute value was changed by us.
+ if (m_isUpdatingAttributeValue)
+ return;
+
+ setValueInternal(newValue);
+}
+
+void DOMTokenList::updateAfterTokenChange()
+{
+ m_cachedValue = nullAtom;
+
+ TemporaryChange<bool> inAttributeUpdate(m_isUpdatingAttributeValue, true);
+ m_element.setAttribute(m_attributeName, value());
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/html/DOMTokenList.h (199297 => 199298)
--- trunk/Source/WebCore/html/DOMTokenList.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/DOMTokenList.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -26,23 +26,23 @@
#ifndef DOMTokenList_h
#define DOMTokenList_h
+#include <Element.h>
#include <wtf/Optional.h>
#include <wtf/Vector.h>
#include <wtf/text/AtomicString.h>
namespace WebCore {
-class Element;
-
typedef int ExceptionCode;
class DOMTokenList {
WTF_MAKE_NONCOPYABLE(DOMTokenList); WTF_MAKE_FAST_ALLOCATED;
public:
- virtual ~DOMTokenList() { }
+ DOMTokenList(Element&, const QualifiedName& attributeName);
+ void attributeValueChanged(const AtomicString&);
- virtual void ref() = 0;
- virtual void deref() = 0;
+ void ref() { m_element.ref(); }
+ void deref() { m_element.deref(); }
unsigned length() const;
const AtomicString& item(unsigned index) const;
@@ -56,23 +56,23 @@
const AtomicString& toString() const { return value(); }
- virtual Element* element() const { return nullptr; }
+ Element& element() const { return m_element; }
void setValue(const String&);
const AtomicString& value() const;
-protected:
- DOMTokenList() = default;
+private:
void setValueInternal(const String&);
+ void updateAfterTokenChange();
- virtual void updateAfterTokenChange() { m_cachedValue = nullAtom; }
-
-private:
static bool validateToken(const String&, ExceptionCode&);
static bool validateTokens(const String* tokens, size_t length, ExceptionCode&);
void addInternal(const String* tokens, size_t length, ExceptionCode&);
void removeInternal(const String* tokens, size_t length, ExceptionCode&);
+ Element& m_element;
+ const WebCore::QualifiedName& m_attributeName;
+ bool m_isUpdatingAttributeValue { false };
Vector<AtomicString> m_tokens;
mutable AtomicString m_cachedValue;
};
Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -24,7 +24,7 @@
#include "config.h"
#include "HTMLAnchorElement.h"
-#include "AttributeDOMTokenList.h"
+#include "DOMTokenList.h"
#include "ElementIterator.h"
#include "EventHandler.h"
#include "EventNames.h"
@@ -303,7 +303,7 @@
DOMTokenList& HTMLAnchorElement::relList()
{
if (!m_relList)
- m_relList = std::make_unique<AttributeDOMTokenList>(*this, HTMLNames::relAttr);
+ m_relList = std::make_unique<DOMTokenList>(*this, HTMLNames::relAttr);
return *m_relList;
}
Modified: trunk/Source/WebCore/html/HTMLAnchorElement.h (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLAnchorElement.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -30,7 +30,7 @@
namespace WebCore {
-class AttributeDOMTokenList;
+class DOMTokenList;
// Link relation bitmask values.
// FIXME: Uncomment as the various link relations are implemented.
@@ -151,7 +151,7 @@
uint32_t m_linkRelations : 30;
mutable LinkHash m_cachedVisitedLinkHash;
- std::unique_ptr<AttributeDOMTokenList> m_relList;
+ std::unique_ptr<DOMTokenList> m_relList;
};
inline LinkHash HTMLAnchorElement::visitedLinkHash() const
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -25,8 +25,8 @@
#include "config.h"
#include "HTMLIFrameElement.h"
-#include "AttributeDOMTokenList.h"
#include "CSSPropertyNames.h"
+#include "DOMTokenList.h"
#include "Frame.h"
#include "HTMLDocument.h"
#include "HTMLNames.h"
@@ -51,7 +51,7 @@
DOMTokenList& HTMLIFrameElement::sandbox()
{
if (!m_sandbox)
- m_sandbox = std::make_unique<AttributeDOMTokenList>(*this, sandboxAttr);
+ m_sandbox = std::make_unique<DOMTokenList>(*this, sandboxAttr);
return *m_sandbox;
}
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.h (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLIFrameElement.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -28,7 +28,7 @@
namespace WebCore {
-class AttributeDOMTokenList;
+class DOMTokenList;
class HTMLIFrameElement final : public HTMLFrameElementBase {
public:
@@ -50,7 +50,7 @@
bool rendererIsNeeded(const RenderStyle&) override;
RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override;
- std::unique_ptr<AttributeDOMTokenList> m_sandbox;
+ std::unique_ptr<DOMTokenList> m_sandbox;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -26,13 +26,13 @@
#include "HTMLLinkElement.h"
#include "Attribute.h"
-#include "AttributeDOMTokenList.h"
#include "AuthorStyleSheets.h"
#include "CachedCSSStyleSheet.h"
#include "CachedResource.h"
#include "CachedResourceLoader.h"
#include "CachedResourceRequest.h"
#include "ContentSecurityPolicy.h"
+#include "DOMTokenList.h"
#include "Document.h"
#include "Event.h"
#include "EventSender.h"
@@ -378,7 +378,7 @@
DOMTokenList& HTMLLinkElement::sizes()
{
if (!m_sizes)
- m_sizes = std::make_unique<AttributeDOMTokenList>(*this, sizesAttr);
+ m_sizes = std::make_unique<DOMTokenList>(*this, sizesAttr);
return *m_sizes;
}
@@ -418,7 +418,7 @@
DOMTokenList& HTMLLinkElement::relList()
{
if (!m_relList)
- m_relList = std::make_unique<AttributeDOMTokenList>(*this, HTMLNames::relAttr);
+ m_relList = std::make_unique<DOMTokenList>(*this, HTMLNames::relAttr);
return *m_relList;
}
Modified: trunk/Source/WebCore/html/HTMLLinkElement.h (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLLinkElement.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLLinkElement.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -24,10 +24,10 @@
#ifndef HTMLLinkElement_h
#define HTMLLinkElement_h
-#include "AttributeDOMTokenList.h"
#include "CSSStyleSheet.h"
#include "CachedStyleSheetClient.h"
#include "CachedResourceHandle.h"
+#include "DOMTokenList.h"
#include "HTMLElement.h"
#include "LinkLoader.h"
#include "LinkLoaderClient.h"
@@ -35,7 +35,7 @@
namespace WebCore {
-class AttributeDOMTokenList;
+class DOMTokenList;
class HTMLLinkElement;
class URL;
@@ -128,7 +128,7 @@
String m_type;
String m_media;
- std::unique_ptr<AttributeDOMTokenList> m_sizes;
+ std::unique_ptr<DOMTokenList> m_sizes;
DisabledState m_disabledState;
LinkRelAttribute m_relAttribute;
bool m_loading;
@@ -139,7 +139,7 @@
PendingSheetType m_pendingSheetType;
- std::unique_ptr<AttributeDOMTokenList> m_relList;
+ std::unique_ptr<DOMTokenList> m_relList;
};
} //namespace
Modified: trunk/Source/WebCore/html/HTMLOutputElement.cpp (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLOutputElement.cpp 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLOutputElement.cpp 2016-04-11 18:49:13 UTC (rev 199298)
@@ -130,7 +130,7 @@
DOMTokenList& HTMLOutputElement::htmlFor()
{
if (!m_tokens)
- m_tokens = std::make_unique<AttributeDOMTokenList>(*this, forAttr);
+ m_tokens = std::make_unique<DOMTokenList>(*this, forAttr);
return *m_tokens;
}
Modified: trunk/Source/WebCore/html/HTMLOutputElement.h (199297 => 199298)
--- trunk/Source/WebCore/html/HTMLOutputElement.h 2016-04-11 18:20:59 UTC (rev 199297)
+++ trunk/Source/WebCore/html/HTMLOutputElement.h 2016-04-11 18:49:13 UTC (rev 199298)
@@ -31,7 +31,7 @@
#ifndef HTMLOutputElement_h
#define HTMLOutputElement_h
-#include "AttributeDOMTokenList.h"
+#include "DOMTokenList.h"
#include "HTMLFormControlElement.h"
namespace WebCore {
@@ -65,7 +65,7 @@
bool m_isDefaultValueMode;
bool m_isSetTextContentInProgress;
String m_defaultValue;
- std::unique_ptr<AttributeDOMTokenList> m_tokens;
+ std::unique_ptr<DOMTokenList> m_tokens;
};
} // namespace
