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

Unified Diff: third_party/WebKit/Source/core/html/HTMLLinkElement.h

Issue 1629403003: Merge DOMSettableTokensList into DOMTokensList (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed non-oilpan inheritance Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLLinkElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLLinkElement.h b/third_party/WebKit/Source/core/html/HTMLLinkElement.h
index 735e8f7f22cf59907bcd05239d7e33a36217ea00..fddcd513d1235e2fa62384eb1c3b031a45d2dd18 100644
--- a/third_party/WebKit/Source/core/html/HTMLLinkElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLLinkElement.h
@@ -26,7 +26,7 @@
#include "core/CoreExport.h"
#include "core/css/CSSStyleSheet.h"
-#include "core/dom/DOMSettableTokenList.h"
+#include "core/dom/DOMTokenList.h"
#include "core/dom/IconURL.h"
#include "core/fetch/ResourceOwner.h"
#include "core/fetch/StyleSheetResource.h"
@@ -129,7 +129,7 @@ private:
};
-class CORE_EXPORT HTMLLinkElement final : public HTMLElement, public LinkLoaderClient, private DOMSettableTokenListObserver {
+class CORE_EXPORT HTMLLinkElement final : public HTMLElement, public LinkLoaderClient, private DOMTokenListObserver {
DEFINE_WRAPPERTYPEINFO();
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(HTMLLinkElement);
public:
@@ -162,7 +162,7 @@ public:
bool isDisabled() const { return linkStyle() && linkStyle()->isDisabled(); }
bool isEnabledViaScript() const { return linkStyle() && linkStyle()->isEnabledViaScript(); }
- DOMSettableTokenList* sizes() const;
+ DOMTokenList* sizes() const;
void dispatchPendingEvent(LinkEventSender*);
void scheduleEvent();
@@ -214,7 +214,7 @@ private:
void didSendLoadForLinkPrerender() override;
void didSendDOMContentLoadedForLinkPrerender() override;
- // From DOMSettableTokenListObserver
+ // From DOMTokenListObserver
void valueWasSet() final;
OwnPtrWillBeMember<LinkResource> m_link;
@@ -223,9 +223,9 @@ private:
String m_type;
String m_as;
String m_media;
- RefPtrWillBeMember<DOMSettableTokenList> m_sizes;
+ RefPtrWillBeMember<DOMTokenList> m_sizes;
Vector<IntSize> m_iconSizes;
- OwnPtrWillBeMember<RelList> m_relList;
+ RefPtrWillBeMember<RelList> m_relList;
LinkRelAttribute m_relAttribute;
bool m_createdByParser;

Powered by Google App Engine
This is Rietveld 408576698