X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fcore%2Fhtml%2FHTMLLinkElement.h;h=011e49ac927f4469ce9f21dcb0d869cd61ab3412;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=522e2e64106627c373731ef5d66f371bebc02dc3;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/core/html/HTMLLinkElement.h b/src/third_party/WebKit/Source/core/html/HTMLLinkElement.h
index 522e2e6..011e49a 100644
--- a/src/third_party/WebKit/Source/core/html/HTMLLinkElement.h
+++ b/src/third_party/WebKit/Source/core/html/HTMLLinkElement.h
@@ -38,7 +38,6 @@
 
 namespace blink {
 
-class DocumentFragment;
 class HTMLLinkElement;
 class KURL;
 class LinkImport;
@@ -55,7 +54,7 @@ typedef EventSender<HTMLLinkElement> LinkEventSender;
 // changing @rel makes it harder to move such a design so we are
 // sticking current way so far.
 //
-class LinkStyle FINAL : public LinkResource, ResourceOwner<StyleSheetResource> {
+class LinkStyle final : public LinkResource, ResourceOwner<StyleSheetResource> {
     WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
     static PassOwnPtrWillBeRawPtr<LinkStyle> create(HTMLLinkElement* owner);
@@ -63,11 +62,11 @@ public:
     explicit LinkStyle(HTMLLinkElement* owner);
     virtual ~LinkStyle();
 
-    virtual Type type() const OVERRIDE { return Style; }
-    virtual void process() OVERRIDE;
-    virtual void ownerRemoved() OVERRIDE;
-    virtual bool hasLoaded() const OVERRIDE { return m_loadedSheet; }
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual Type type() const override { return Style; }
+    virtual void process() override;
+    virtual void ownerRemoved() override;
+    virtual bool hasLoaded() const override { return m_loadedSheet; }
+    virtual void trace(Visitor*) override;
 
     void startLoadingDynamicSheet();
     void notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred);
@@ -86,7 +85,7 @@ public:
 
 private:
     // From StyleSheetResourceClient
-    virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource*) OVERRIDE;
+    virtual void setCSSStyleSheet(const String& href, const KURL& baseURL, const String& charset, const CSSStyleSheetResource*) override;
 
     enum DisabledState {
         Unset,
@@ -114,7 +113,7 @@ private:
 };
 
 
-class HTMLLinkElement FINAL : public HTMLElement, public LinkLoaderClient {
+class HTMLLinkElement final : public HTMLElement, public LinkLoaderClient {
     DEFINE_WRAPPERTYPEINFO();
 public:
     static PassRefPtrWillBeRawPtr<HTMLLinkElement> create(Document&, bool createdByParser);
@@ -153,7 +152,7 @@ public:
     static void dispatchPendingLoadEvents();
 
     // From LinkLoaderClient
-    virtual bool shouldLoadLink() OVERRIDE;
+    virtual bool shouldLoadLink() override;
 
     // For LinkStyle
     bool loadLink(const String& type, const KURL&);
@@ -165,11 +164,11 @@ public:
     // visible for testing purpose.
     static void parseSizesAttribute(const AtomicString& value, Vector<IntSize>& iconSizes);
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 private:
-    virtual void attributeWillChange(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue) OVERRIDE;
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE;
+    virtual void attributeWillChange(const QualifiedName&, const AtomicString& oldValue, const AtomicString& newValue) override;
+    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
 
     LinkStyle* linkStyle() const;
     LinkImport* linkImport() const;
@@ -179,23 +178,23 @@ private:
     static void processCallback(Node*);
 
     // From Node and subclassses
-    virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE;
-    virtual void removedFrom(ContainerNode*) OVERRIDE;
-    virtual bool isURLAttribute(const Attribute&) const OVERRIDE;
-    virtual bool hasLegalLinkAttribute(const QualifiedName&) const OVERRIDE;
-    virtual const QualifiedName& subResourceAttributeName() const OVERRIDE;
-    virtual bool sheetLoaded() OVERRIDE;
-    virtual void notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred) OVERRIDE;
-    virtual void startLoadingDynamicSheet() OVERRIDE;
-    virtual void finishParsingChildren() OVERRIDE;
+    virtual InsertionNotificationRequest insertedInto(ContainerNode*) override;
+    virtual void removedFrom(ContainerNode*) override;
+    virtual bool isURLAttribute(const Attribute&) const override;
+    virtual bool hasLegalLinkAttribute(const QualifiedName&) const override;
+    virtual const QualifiedName& subResourceAttributeName() const override;
+    virtual bool sheetLoaded() override;
+    virtual void notifyLoadedSheetAndAllCriticalSubresources(bool errorOccurred) override;
+    virtual void startLoadingDynamicSheet() override;
+    virtual void finishParsingChildren() override;
 
     // From LinkLoaderClient
-    virtual void linkLoaded() OVERRIDE;
-    virtual void linkLoadingErrored() OVERRIDE;
-    virtual void didStartLinkPrerender() OVERRIDE;
-    virtual void didStopLinkPrerender() OVERRIDE;
-    virtual void didSendLoadForLinkPrerender() OVERRIDE;
-    virtual void didSendDOMContentLoadedForLinkPrerender() OVERRIDE;
+    virtual void linkLoaded() override;
+    virtual void linkLoadingErrored() override;
+    virtual void didStartLinkPrerender() override;
+    virtual void didStopLinkPrerender() override;
+    virtual void didSendLoadForLinkPrerender() override;
+    virtual void didSendDOMContentLoadedForLinkPrerender() override;
 
 private:
     HTMLLinkElement(Document&, bool createdByParser);