Index: Source/core/dom/Document.h |
diff --git a/Source/core/dom/Document.h b/Source/core/dom/Document.h |
index 5d4103201c657ec1373e82b648d1d06bb72d5f61..1dc82d0421ca71ffdd68fc136f47d99e86112afe 100644 |
--- a/Source/core/dom/Document.h |
+++ b/Source/core/dom/Document.h |
@@ -237,7 +237,7 @@ public: |
using SecurityContext::contentSecurityPolicy; |
using TreeScope::getElementById; |
- virtual bool canContainRangeEndPoint() const OVERRIDE { return true; } |
+ virtual bool canContainRangeEndPoint() const override { return true; } |
SelectorQueryCache& selectorQueryCache(); |
@@ -345,7 +345,7 @@ public: |
void setXMLStandalone(bool, ExceptionState&); |
void setHasXMLDeclaration(bool hasXMLDeclaration) { m_hasXMLDeclaration = hasXMLDeclaration ? 1 : 0; } |
- virtual KURL baseURI() const OVERRIDE FINAL; |
+ virtual KURL baseURI() const override final; |
String visibilityState() const; |
bool hidden() const; |
@@ -479,8 +479,8 @@ public: |
ResourceFetcher* fetcher() { return m_fetcher.get(); } |
- virtual void attach(const AttachContext& = AttachContext()) OVERRIDE; |
- virtual void detach(const AttachContext& = AttachContext()) OVERRIDE; |
+ virtual void attach(const AttachContext& = AttachContext()) override; |
+ virtual void detach(const AttachContext& = AttachContext()) override; |
void prepareForDestruction(); |
// If you have a Document, use renderView() instead which is faster. |
@@ -544,8 +544,8 @@ public: |
KURL completeURL(const String&) const; |
KURL completeURLWithOverride(const String&, const KURL& baseURLOverride) const; |
- virtual String userAgent(const KURL&) const OVERRIDE FINAL; |
- virtual void disableEval(const String& errorMessage) OVERRIDE FINAL; |
+ virtual String userAgent(const KURL&) const override final; |
+ virtual void disableEval(const String& errorMessage) override final; |
bool canNavigate(const Frame& targetFrame); |
LocalFrame* findUnsafeParentScrollPropagationBoundary(); |
@@ -849,14 +849,14 @@ public: |
void parseDNSPrefetchControlHeader(const String&); |
// FIXME(crbug.com/305497): This should be removed once LocalDOMWindow is an ExecutionContext. |
- virtual void postTask(PassOwnPtr<ExecutionContextTask>) OVERRIDE; // Executes the task on context's thread asynchronously. |
+ virtual void postTask(PassOwnPtr<ExecutionContextTask>) override; // Executes the task on context's thread asynchronously. |
void postInspectorTask(PassOwnPtr<ExecutionContextTask>); |
- virtual void tasksWereSuspended() OVERRIDE FINAL; |
- virtual void tasksWereResumed() OVERRIDE FINAL; |
- virtual void suspendScheduledTasks() OVERRIDE FINAL; |
- virtual void resumeScheduledTasks() OVERRIDE FINAL; |
- virtual bool tasksNeedSuspension() OVERRIDE FINAL; |
+ virtual void tasksWereSuspended() override final; |
+ virtual void tasksWereResumed() override final; |
+ virtual void suspendScheduledTasks() override final; |
+ virtual void resumeScheduledTasks() override final; |
+ virtual bool tasksNeedSuspension() override final; |
void finishedParsing(); |
@@ -873,7 +873,7 @@ public: |
const Vector<AnnotatedRegionValue>& annotatedRegions() const; |
void setAnnotatedRegions(const Vector<AnnotatedRegionValue>&); |
- virtual void removeAllEventListeners() OVERRIDE FINAL; |
+ virtual void removeAllEventListeners() override final; |
const SVGDocumentExtensions* svgExtensions(); |
SVGDocumentExtensions& accessSVGExtensions(); |
@@ -905,8 +905,8 @@ public: |
void setContainsPlugins() { m_containsPlugins = true; } |
bool containsPlugins() const { return m_containsPlugins; } |
- virtual bool isContextThread() const OVERRIDE FINAL; |
- virtual bool isJSExecutionForbidden() const OVERRIDE FINAL { return false; } |
+ virtual bool isContextThread() const override final; |
+ virtual bool isJSExecutionForbidden() const override final { return false; } |
bool containsValidityStyleRules() const { return m_containsValidityStyleRules; } |
void setContainsValidityStyleRules() { m_containsValidityStyleRules = true; } |
@@ -940,8 +940,8 @@ public: |
void cancelAnimationFrame(int id); |
void serviceScriptedAnimations(double monotonicAnimationStartTime); |
- virtual EventTarget* errorEventTarget() OVERRIDE FINAL; |
- virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE FINAL; |
+ virtual EventTarget* errorEventTarget() override final; |
+ virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) override final; |
void initDNSPrefetch(); |
@@ -1003,9 +1003,9 @@ public: |
void didAssociateFormControl(Element*); |
- virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERRIDE FINAL; |
+ virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override final; |
- virtual LocalDOMWindow* executingWindow() OVERRIDE FINAL; |
+ virtual LocalDOMWindow* executingWindow() override final; |
LocalFrame* executingFrame(); |
DocumentLifecycleNotifier& lifecycleNotifier(); |
@@ -1032,25 +1032,25 @@ public: |
void updateStyleInvalidationIfNeeded(); |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
bool hasSVGFilterElementsRequiringLayerUpdate() const { return m_layerUpdateSVGFilterElements.size(); } |
void didRecalculateStyleForElement() { ++m_styleRecalcElementCounter; } |
AtomicString convertLocalName(const AtomicString&); |
- virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) OVERRIDE; |
- virtual v8::Handle<v8::Object> associateWithWrapper(const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper, v8::Isolate*) OVERRIDE; |
+ virtual v8::Handle<v8::Object> wrap(v8::Handle<v8::Object> creationContext, v8::Isolate*) override; |
+ virtual v8::Handle<v8::Object> associateWithWrapper(const WrapperTypeInfo*, v8::Handle<v8::Object> wrapper, v8::Isolate*) override; |
protected: |
Document(const DocumentInit&, DocumentClassFlags = DefaultDocumentClass); |
- virtual void didUpdateSecurityOrigin() OVERRIDE FINAL; |
+ virtual void didUpdateSecurityOrigin() override final; |
void clearXMLVersion() { m_xmlVersion = String(); } |
#if !ENABLE(OILPAN) |
- virtual void dispose() OVERRIDE; |
+ virtual void dispose() override; |
#endif |
virtual PassRefPtrWillBeRawPtr<Document> cloneDocumentWithoutChildren(); |
@@ -1067,8 +1067,8 @@ private: |
bool isElementNode() const WTF_DELETED_FUNCTION; // This will catch anyone doing an unnecessary check. |
ScriptedAnimationController& ensureScriptedAnimationController(); |
- virtual SecurityContext& securityContext() OVERRIDE FINAL { return *this; } |
- virtual EventQueue* eventQueue() const OVERRIDE FINAL; |
+ virtual SecurityContext& securityContext() override final { return *this; } |
+ virtual EventQueue* eventQueue() const override final; |
// FIXME: Rename the StyleRecalc state to RenderTreeUpdate. |
bool hasPendingStyleRecalc() const { return m_lifecycle.state() == DocumentLifecycle::VisualUpdatePending; } |
@@ -1092,27 +1092,27 @@ private: |
void clearWeakMembers(Visitor*); |
- virtual bool isDocument() const OVERRIDE FINAL { return true; } |
+ virtual bool isDocument() const override final { return true; } |
- virtual void childrenChanged(const ChildrenChange&) OVERRIDE; |
+ virtual void childrenChanged(const ChildrenChange&) override; |
- virtual String nodeName() const OVERRIDE FINAL; |
- virtual NodeType nodeType() const OVERRIDE FINAL; |
- virtual bool childTypeAllowed(NodeType) const OVERRIDE FINAL; |
- virtual PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep = true) OVERRIDE FINAL; |
+ virtual String nodeName() const override final; |
+ virtual NodeType nodeType() const override final; |
+ virtual bool childTypeAllowed(NodeType) const override final; |
+ virtual PassRefPtrWillBeRawPtr<Node> cloneNode(bool deep = true) override final; |
void cloneDataFromDocument(const Document&); |
#if !ENABLE(OILPAN) |
- virtual void refExecutionContext() OVERRIDE FINAL { ref(); } |
- virtual void derefExecutionContext() OVERRIDE FINAL { deref(); } |
+ virtual void refExecutionContext() override final { ref(); } |
+ virtual void derefExecutionContext() override final { deref(); } |
#endif |
- virtual const KURL& virtualURL() const OVERRIDE FINAL; // Same as url(), but needed for ExecutionContext to implement it without a performance loss for direct calls. |
- virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL; // Same as completeURL() for the same reason as above. |
+ virtual const KURL& virtualURL() const override final; // Same as url(), but needed for ExecutionContext to implement it without a performance loss for direct calls. |
+ virtual KURL virtualCompleteURL(const String&) const override final; // Same as completeURL() for the same reason as above. |
- virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) OVERRIDE FINAL; |
+ virtual void reportBlockedScriptExecutionToInspector(const String& directiveText) override final; |
- virtual double timerAlignmentInterval() const OVERRIDE FINAL; |
+ virtual double timerAlignmentInterval() const override final; |
void updateTitle(const String&); |
void updateFocusAppearanceTimerFired(Timer<Document>*); |