Changeset 197566 in webkit
- Timestamp:
- Mar 4, 2016 9:20:46 AM (8 years ago)
- Location:
- trunk
- Files:
-
- 165 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/inspector/ScriptDebugServer.h
r197563 r197566 93 93 typedef HashMap<JSC::BreakpointID, BreakpointActions> BreakpointIDToActionsMap; 94 94 95 void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) overridefinal;96 bool needPauseHandling(JSC::JSGlobalObject*) overridefinal { return true; }97 void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) overridefinal;98 void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const overridefinal;99 void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) overridefinal;100 void notifyDoneProcessingDebuggerEvents() overridefinal;95 void sourceParsed(JSC::ExecState*, JSC::SourceProvider*, int errorLine, const String& errorMsg) final; 96 bool needPauseHandling(JSC::JSGlobalObject*) final { return true; } 97 void handleBreakpointHit(JSC::JSGlobalObject*, const JSC::Breakpoint&) final; 98 void handleExceptionInBreakpointCondition(JSC::ExecState*, JSC::Exception*) const final; 99 void handlePause(JSC::JSGlobalObject*, JSC::Debugger::ReasonForPause) final; 100 void notifyDoneProcessingDebuggerEvents() final; 101 101 102 102 Deprecated::ScriptValue exceptionOrCaughtValue(JSC::ExecState*); -
trunk/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
r197563 r197566 128 128 Ref<Inspector::Protocol::Array<Inspector::Protocol::Debugger::CallFrame>> currentCallFrames(const InjectedScript&); 129 129 130 void didParseSource(JSC::SourceID, const Script&) overridefinal;131 void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) overridefinal;130 void didParseSource(JSC::SourceID, const Script&) final; 131 void failedToParseSource(const String& url, const String& data, int firstLine, int errorLine, const String& errorMessage) final; 132 132 133 133 void breakpointActionSound(int breakpointActionIdentifier) override; 134 void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample) overridefinal;134 void breakpointActionProbe(JSC::ExecState*, const ScriptBreakpointAction&, unsigned batchId, unsigned sampleId, const Deprecated::ScriptValue& sample) final; 135 135 136 136 RefPtr<Inspector::Protocol::Debugger::Location> resolveBreakpoint(const String& breakpointIdentifier, JSC::SourceID, const ScriptBreakpoint&); -
trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
r197563 r197566 60 60 void enable(ErrorString&) override { m_enabled = true; } 61 61 void disable(ErrorString&) override { m_enabled = false; } 62 void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) overridefinal;63 void evaluate(ErrorString&, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) overridefinal;64 void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const Inspector::InspectorArray* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) overridefinal;65 void releaseObject(ErrorString&, const ErrorString& objectId) overridefinal;66 void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) overridefinal;67 void getDisplayableProperties(ErrorString&, const String& objectId, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) overridefinal;68 void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) overridefinal;69 void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) overridefinal;70 void releaseObjectGroup(ErrorString&, const String& objectGroup) overridefinal;62 void parse(ErrorString&, const String& expression, Inspector::Protocol::Runtime::SyntaxErrorType* result, Inspector::Protocol::OptOutput<String>* message, RefPtr<Inspector::Protocol::Runtime::ErrorRange>&) final; 63 void evaluate(ErrorString&, const String& expression, const String* objectGroup, const bool* includeCommandLineAPI, const bool* doNotPauseOnExceptionsAndMuteConsole, const int* executionContextId, const bool* returnByValue, const bool* generatePreview, const bool* saveResult, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown, Inspector::Protocol::OptOutput<int>* savedResultIndex) final; 64 void callFunctionOn(ErrorString&, const String& objectId, const String& expression, const Inspector::InspectorArray* optionalArguments, const bool* doNotPauseOnExceptionsAndMuteConsole, const bool* returnByValue, const bool* generatePreview, RefPtr<Inspector::Protocol::Runtime::RemoteObject>& result, Inspector::Protocol::OptOutput<bool>* wasThrown) final; 65 void releaseObject(ErrorString&, const ErrorString& objectId) final; 66 void getProperties(ErrorString&, const String& objectId, const bool* ownProperties, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final; 67 void getDisplayableProperties(ErrorString&, const String& objectId, const bool* generatePreview, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::PropertyDescriptor>>& result, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::InternalPropertyDescriptor>>& internalProperties) final; 68 void getCollectionEntries(ErrorString&, const String& objectId, const String* objectGroup, const int* startIndex, const int* numberToFetch, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::CollectionEntry>>& entries) final; 69 void saveResult(ErrorString&, const Inspector::InspectorObject& callArgument, const int* executionContextId, Inspector::Protocol::OptOutput<int>* savedResultIndex) final; 70 void releaseObjectGroup(ErrorString&, const String& objectGroup) final; 71 71 void getRuntimeTypesForVariablesAtOffsets(ErrorString&, const Inspector::InspectorArray& locations, RefPtr<Inspector::Protocol::Array<Inspector::Protocol::Runtime::TypeDescription>>&) override; 72 72 void enableTypeProfiler(ErrorString&) override; -
trunk/Source/JavaScriptCore/parser/Nodes.h
r197563 r197566 264 264 double value() const { return m_value; } 265 265 virtual bool isIntegerNode() const = 0; 266 RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) overridefinal;267 268 private: 269 bool isNumber() const overridefinal { return true; }266 RegisterID* emitBytecode(BytecodeGenerator&, RegisterID* = 0) final; 267 268 private: 269 bool isNumber() const final { return true; } 270 270 JSValue jsValue(BytecodeGenerator&) const override { return jsNumber(m_value); } 271 271 … … 285 285 public: 286 286 IntegerNode(const JSTokenLocation&, double value); 287 bool isIntegerNode() const overridefinal { return true; }287 bool isIntegerNode() const final { return true; } 288 288 }; 289 289 -
trunk/Source/JavaScriptCore/replay/scripts/CodeGeneratorReplayInputs.py
r194496 r197566 719 719 "", 720 720 " // EventLoopInput API", 721 " virtual void dispatch(ReplayController&) overridefinal;",721 " virtual void dispatch(ReplayController&) final;", 722 722 ]) 723 723 -
trunk/Source/JavaScriptCore/replay/scripts/tests/expected/generate-enum-with-guard.json-TestReplayInputs.h
r197563 r197566 73 73 74 74 // EventLoopInput API 75 void dispatch(ReplayController&) overridefinal;75 void dispatch(ReplayController&) final; 76 76 const PlatformWheelEvent& platformEvent() const { return *m_platformEvent; } 77 77 PlatformWheelPhase phase() const { return m_phase; } -
trunk/Source/WebCore/Modules/gamepad/GamepadManager.h
r197563 r197566 47 47 static GamepadManager& singleton(); 48 48 49 void platformGamepadConnected(PlatformGamepad&) overridefinal;50 void platformGamepadDisconnected(PlatformGamepad&) overridefinal;51 void platformGamepadInputActivity() overridefinal;49 void platformGamepadConnected(PlatformGamepad&) final; 50 void platformGamepadDisconnected(PlatformGamepad&) final; 51 void platformGamepadInputActivity() final; 52 52 53 53 void registerNavigator(NavigatorGamepad*); -
trunk/Source/WebCore/Modules/indexeddb/client/IDBAnyImpl.h
r197563 r197566 76 76 virtual ~IDBAny(); 77 77 78 Type type() const overridefinal { return m_type; }79 RefPtr<WebCore::DOMStringList> domStringList() overridefinal;80 RefPtr<WebCore::IDBCursor> idbCursor() overridefinal;81 RefPtr<WebCore::IDBCursorWithValue> idbCursorWithValue() overridefinal;82 RefPtr<WebCore::IDBDatabase> idbDatabase() overridefinal;83 RefPtr<WebCore::IDBFactory> idbFactory() overridefinal;84 RefPtr<WebCore::IDBIndex> idbIndex() overridefinal;85 RefPtr<WebCore::IDBObjectStore> idbObjectStore() overridefinal;86 RefPtr<WebCore::IDBTransaction> idbTransaction() overridefinal;87 const Deprecated::ScriptValue& scriptValue() overridefinal;88 int64_t integer() overridefinal;89 const String& string() overridefinal;90 const IDBKeyPath& keyPath() overridefinal;78 Type type() const final { return m_type; } 79 RefPtr<WebCore::DOMStringList> domStringList() final; 80 RefPtr<WebCore::IDBCursor> idbCursor() final; 81 RefPtr<WebCore::IDBCursorWithValue> idbCursorWithValue() final; 82 RefPtr<WebCore::IDBDatabase> idbDatabase() final; 83 RefPtr<WebCore::IDBFactory> idbFactory() final; 84 RefPtr<WebCore::IDBIndex> idbIndex() final; 85 RefPtr<WebCore::IDBObjectStore> idbObjectStore() final; 86 RefPtr<WebCore::IDBTransaction> idbTransaction() final; 87 const Deprecated::ScriptValue& scriptValue() final; 88 int64_t integer() final; 89 const String& string() final; 90 const IDBKeyPath& keyPath() final; 91 91 92 92 IDBObjectStore* modernIDBObjectStore(); -
trunk/Source/WebCore/Modules/indexeddb/client/IDBCursorImpl.h
r197563 r197566 50 50 51 51 // Implement the IDL 52 const String& direction() const overridefinal;53 const Deprecated::ScriptValue& key() const overridefinal;54 const Deprecated::ScriptValue& primaryKey() const overridefinal;55 const Deprecated::ScriptValue& value() const overridefinal;56 IDBAny* source() overridefinal;52 const String& direction() const final; 53 const Deprecated::ScriptValue& key() const final; 54 const Deprecated::ScriptValue& primaryKey() const final; 55 const Deprecated::ScriptValue& value() const final; 56 IDBAny* source() final; 57 57 58 RefPtr<WebCore::IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCodeWithMessage&) overridefinal;59 void advance(unsigned long, ExceptionCodeWithMessage&) overridefinal;60 void continueFunction(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;61 void continueFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;62 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;58 RefPtr<WebCore::IDBRequest> update(JSC::ExecState&, Deprecated::ScriptValue&, ExceptionCodeWithMessage&) final; 59 void advance(unsigned long, ExceptionCodeWithMessage&) final; 60 void continueFunction(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 61 void continueFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 62 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 63 63 64 64 void continueFunction(const IDBKeyData&, ExceptionCodeWithMessage&); … … 73 73 74 74 bool isKeyCursor() const override { return true; } 75 bool isModernCursor() const overridefinal { return true; }75 bool isModernCursor() const final { return true; } 76 76 77 77 void decrementOutstandingRequestCount(); … … 83 83 private: 84 84 // ActiveDOMObject. 85 const char* activeDOMObjectName() const overridefinal;86 bool canSuspendForDocumentSuspension() const overridefinal;87 bool hasPendingActivity() const overridefinal;85 const char* activeDOMObjectName() const final; 86 bool canSuspendForDocumentSuspension() const final; 87 bool hasPendingActivity() const final; 88 88 89 89 // Cursors are created with an outstanding iteration request. -
trunk/Source/WebCore/Modules/indexeddb/client/IDBCursorWithValueImpl.h
r197563 r197566 41 41 virtual ~IDBCursorWithValue(); 42 42 43 bool isKeyCursor() const overridefinal { return false; }43 bool isKeyCursor() const final { return false; } 44 44 45 45 private: -
trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.h
r197563 r197566 50 50 51 51 // IDBDatabase IDL 52 const String name() const overridefinal;53 uint64_t version() const overridefinal;54 RefPtr<DOMStringList> objectStoreNames() const overridefinal;52 const String name() const final; 53 uint64_t version() const final; 54 RefPtr<DOMStringList> objectStoreNames() const final; 55 55 56 RefPtr<WebCore::IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCodeWithMessage&) overridefinal;57 RefPtr<WebCore::IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCodeWithMessage&) overridefinal;58 RefPtr<WebCore::IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCodeWithMessage&) overridefinal;59 RefPtr<WebCore::IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCodeWithMessage&) overridefinal;60 void deleteObjectStore(const String& name, ExceptionCodeWithMessage&) overridefinal;61 void close() overridefinal;56 RefPtr<WebCore::IDBObjectStore> createObjectStore(const String& name, const Dictionary&, ExceptionCodeWithMessage&) final; 57 RefPtr<WebCore::IDBObjectStore> createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionCodeWithMessage&) final; 58 RefPtr<WebCore::IDBTransaction> transaction(ScriptExecutionContext*, const Vector<String>&, const String& mode, ExceptionCodeWithMessage&) final; 59 RefPtr<WebCore::IDBTransaction> transaction(ScriptExecutionContext*, const String&, const String& mode, ExceptionCodeWithMessage&) final; 60 void deleteObjectStore(const String& name, ExceptionCodeWithMessage&) final; 61 void close() final; 62 62 63 63 // EventTarget 64 EventTargetInterface eventTargetInterface() const overridefinal { return IDBDatabaseEventTargetInterfaceType; }65 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return ActiveDOMObject::scriptExecutionContext(); }66 void refEventTarget() overridefinal { ref(); }67 void derefEventTarget() overridefinal { deref(); }64 EventTargetInterface eventTargetInterface() const final { return IDBDatabaseEventTargetInterfaceType; } 65 ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); } 66 void refEventTarget() final { ref(); } 67 void derefEventTarget() final { deref(); } 68 68 69 const char* activeDOMObjectName() const overridefinal;70 bool canSuspendForDocumentSuspension() const overridefinal;71 void stop() overridefinal;69 const char* activeDOMObjectName() const final; 70 bool canSuspendForDocumentSuspension() const final; 71 void stop() final; 72 72 73 73 const IDBDatabaseInfo& info() const { return m_info; } … … 91 91 bool isClosingOrClosed() const { return m_closePending || m_closedInServer; } 92 92 93 bool dispatchEvent(Event&) overridefinal;93 bool dispatchEvent(Event&) final; 94 94 95 95 private: … … 100 100 void maybeCloseInServer(); 101 101 102 bool hasPendingActivity() const overridefinal;102 bool hasPendingActivity() const final; 103 103 104 104 Ref<IDBConnectionToServer> m_serverConnection; -
trunk/Source/WebCore/Modules/indexeddb/client/IDBFactoryImpl.h
r197563 r197566 41 41 static Ref<IDBFactory> create(IDBConnectionToServer&); 42 42 43 RefPtr<WebCore::IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) overridefinal;43 RefPtr<WebCore::IDBRequest> getDatabaseNames(ScriptExecutionContext*, ExceptionCode&) final; 44 44 45 RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) overridefinal;46 RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) overridefinal;47 RefPtr<WebCore::IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) overridefinal;45 RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, ExceptionCode&) final; 46 RefPtr<WebCore::IDBOpenDBRequest> open(ScriptExecutionContext*, const String& name, unsigned long long version, ExceptionCode&) final; 47 RefPtr<WebCore::IDBOpenDBRequest> deleteDatabase(ScriptExecutionContext*, const String& name, ExceptionCode&) final; 48 48 49 short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCodeWithMessage&) overridefinal;49 short cmp(ScriptExecutionContext*, const Deprecated::ScriptValue& first, const Deprecated::ScriptValue& second, ExceptionCodeWithMessage&) final; 50 50 51 51 private: -
trunk/Source/WebCore/Modules/indexeddb/client/IDBIndexImpl.h
r197563 r197566 49 49 50 50 // Implement the IDL 51 const String& name() const overridefinal;52 RefPtr<WebCore::IDBObjectStore> objectStore() overridefinal;53 RefPtr<WebCore::IDBAny> keyPathAny() const overridefinal;54 const IDBKeyPath& keyPath() const overridefinal;55 bool unique() const overridefinal;56 bool multiEntry() const overridefinal;51 const String& name() const final; 52 RefPtr<WebCore::IDBObjectStore> objectStore() final; 53 RefPtr<WebCore::IDBAny> keyPathAny() const final; 54 const IDBKeyPath& keyPath() const final; 55 bool unique() const final; 56 bool multiEntry() const final; 57 57 58 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCodeWithMessage& ec) overridefinal { return openCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }59 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCodeWithMessage& ec) overridefinal { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); }60 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage& ec) overridefinal { return openCursor(context, key, IDBCursor::directionNext(), ec); }61 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) overridefinal;62 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) overridefinal;58 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, ExceptionCodeWithMessage& ec) final { return openCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); } 59 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCodeWithMessage& ec) final { return openCursor(context, keyRange, IDBCursor::directionNext(), ec); } 60 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage& ec) final { return openCursor(context, key, IDBCursor::directionNext(), ec); } 61 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) final; 62 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) final; 63 63 64 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;65 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;66 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;64 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 65 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 66 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 67 67 68 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, ExceptionCodeWithMessage& ec) overridefinal { return openKeyCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); }69 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCodeWithMessage& ec) overridefinal { return openKeyCursor(context, keyRange, IDBCursor::directionNext(), ec); }70 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage& ec) overridefinal { return openKeyCursor(context, key, IDBCursor::directionNext(), ec); }71 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) overridefinal;72 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) overridefinal;68 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, ExceptionCodeWithMessage& ec) final { return openKeyCursor(context, static_cast<IDBKeyRange*>(nullptr), ec); } 69 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, IDBKeyRange* keyRange, ExceptionCodeWithMessage& ec) final { return openKeyCursor(context, keyRange, IDBCursor::directionNext(), ec); } 70 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext* context, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage& ec) final { return openKeyCursor(context, key, IDBCursor::directionNext(), ec); } 71 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) final; 72 RefPtr<WebCore::IDBRequest> openKeyCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) final; 73 73 74 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;75 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;76 RefPtr<WebCore::IDBRequest> getKey(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;77 RefPtr<WebCore::IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;74 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 75 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 76 RefPtr<WebCore::IDBRequest> getKey(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 77 RefPtr<WebCore::IDBRequest> getKey(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 78 78 79 79 const IDBIndexInfo& info() const { return m_info; } … … 95 95 96 96 // ActiveDOMObject 97 const char* activeDOMObjectName() const overridefinal;98 bool canSuspendForDocumentSuspension() const overridefinal;99 bool hasPendingActivity() const overridefinal;97 const char* activeDOMObjectName() const final; 98 bool canSuspendForDocumentSuspension() const final; 99 bool hasPendingActivity() const final; 100 100 101 101 IDBIndexInfo m_info; -
trunk/Source/WebCore/Modules/indexeddb/client/IDBObjectStoreImpl.h
r197563 r197566 50 50 static Ref<IDBObjectStore> create(ScriptExecutionContext*, const IDBObjectStoreInfo&, IDBTransaction&); 51 51 52 ~IDBObjectStore() overridefinal;52 ~IDBObjectStore() final; 53 53 54 54 // Implement the IDBObjectStore IDL 55 const String name() const overridefinal;56 RefPtr<WebCore::IDBAny> keyPathAny() const overridefinal;57 const IDBKeyPath keyPath() const overridefinal;58 RefPtr<DOMStringList> indexNames() const overridefinal;59 RefPtr<WebCore::IDBTransaction> transaction() overridefinal;60 bool autoIncrement() const overridefinal;55 const String name() const final; 56 RefPtr<WebCore::IDBAny> keyPathAny() const final; 57 const IDBKeyPath keyPath() const final; 58 RefPtr<DOMStringList> indexNames() const final; 59 RefPtr<WebCore::IDBTransaction> transaction() final; 60 bool autoIncrement() const final; 61 61 62 RefPtr<WebCore::IDBRequest> add(JSC::ExecState&, JSC::JSValue, ExceptionCodeWithMessage&) overridefinal;63 RefPtr<WebCore::IDBRequest> put(JSC::ExecState&, JSC::JSValue, ExceptionCodeWithMessage&) overridefinal;64 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;65 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;66 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;67 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) overridefinal;68 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) overridefinal;69 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;70 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;71 RefPtr<WebCore::IDBRequest> add(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&) overridefinal;72 RefPtr<WebCore::IDBRequest> put(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&) overridefinal;73 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;74 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;75 RefPtr<WebCore::IDBRequest> clear(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;76 RefPtr<WebCore::IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCodeWithMessage&) overridefinal;77 RefPtr<WebCore::IDBIndex> index(const String& name, ExceptionCodeWithMessage&) overridefinal;78 void deleteIndex(const String& name, ExceptionCodeWithMessage&) overridefinal;79 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, ExceptionCodeWithMessage&) overridefinal;80 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) overridefinal;81 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) overridefinal;62 RefPtr<WebCore::IDBRequest> add(JSC::ExecState&, JSC::JSValue, ExceptionCodeWithMessage&) final; 63 RefPtr<WebCore::IDBRequest> put(JSC::ExecState&, JSC::JSValue, ExceptionCodeWithMessage&) final; 64 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 65 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 66 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 67 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, IDBKeyRange*, const String& direction, ExceptionCodeWithMessage&) final; 68 RefPtr<WebCore::IDBRequest> openCursor(ScriptExecutionContext*, const Deprecated::ScriptValue& key, const String& direction, ExceptionCodeWithMessage&) final; 69 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 70 RefPtr<WebCore::IDBRequest> get(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 71 RefPtr<WebCore::IDBRequest> add(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&) final; 72 RefPtr<WebCore::IDBRequest> put(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&) final; 73 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 74 RefPtr<WebCore::IDBRequest> deleteFunction(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 75 RefPtr<WebCore::IDBRequest> clear(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 76 RefPtr<WebCore::IDBIndex> createIndex(ScriptExecutionContext*, const String& name, const IDBKeyPath&, bool unique, bool multiEntry, ExceptionCodeWithMessage&) final; 77 RefPtr<WebCore::IDBIndex> index(const String& name, ExceptionCodeWithMessage&) final; 78 void deleteIndex(const String& name, ExceptionCodeWithMessage&) final; 79 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, ExceptionCodeWithMessage&) final; 80 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, IDBKeyRange*, ExceptionCodeWithMessage&) final; 81 RefPtr<WebCore::IDBRequest> count(ScriptExecutionContext*, const Deprecated::ScriptValue& key, ExceptionCodeWithMessage&) final; 82 82 83 83 RefPtr<IDBRequest> putForCursorUpdate(JSC::ExecState&, JSC::JSValue, JSC::JSValue key, ExceptionCodeWithMessage&); … … 112 112 113 113 // ActiveDOMObject 114 const char* activeDOMObjectName() const overridefinal;115 bool canSuspendForDocumentSuspension() const overridefinal;116 bool hasPendingActivity() const overridefinal;114 const char* activeDOMObjectName() const final; 115 bool canSuspendForDocumentSuspension() const final; 116 bool hasPendingActivity() const final; 117 117 118 118 IDBObjectStoreInfo m_info; -
trunk/Source/WebCore/Modules/indexeddb/client/IDBOpenDBRequestImpl.h
r197563 r197566 46 46 static Ref<IDBOpenDBRequest> createOpenRequest(IDBConnectionToServer&, ScriptExecutionContext*, const IDBDatabaseIdentifier&, uint64_t version); 47 47 48 ~IDBOpenDBRequest() overridefinal;48 ~IDBOpenDBRequest() final; 49 49 50 50 const IDBDatabaseIdentifier& databaseIdentifier() const { return m_databaseIdentifier; } … … 58 58 void fireErrorAfterVersionChangeCompletion(); 59 59 60 bool dispatchEvent(Event&) overridefinal;60 bool dispatchEvent(Event&) final; 61 61 62 62 private: -
trunk/Source/WebCore/Modules/indexeddb/client/IDBRequestImpl.h
r197563 r197566 75 75 // EventTarget 76 76 EventTargetInterface eventTargetInterface() const override; 77 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return ActiveDOMObject::scriptExecutionContext(); }77 ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); } 78 78 79 79 using RefCounted<IDBRequest>::ref; … … 112 112 113 113 // ActiveDOMObject. 114 const char* activeDOMObjectName() const overridefinal;115 bool canSuspendForDocumentSuspension() const overridefinal;116 bool hasPendingActivity() const overridefinal;117 void stop() overridefinal;114 const char* activeDOMObjectName() const final; 115 bool canSuspendForDocumentSuspension() const final; 116 bool hasPendingActivity() const final; 117 void stop() final; 118 118 119 119 // EventTarget. 120 void refEventTarget() overridefinal { RefCounted<IDBRequest>::ref(); }121 void derefEventTarget() overridefinal { RefCounted<IDBRequest>::deref(); }122 void uncaughtExceptionInEventHandler() overridefinal;120 void refEventTarget() final { RefCounted<IDBRequest>::ref(); } 121 void derefEventTarget() final { RefCounted<IDBRequest>::deref(); } 122 void uncaughtExceptionInEventHandler() final; 123 123 124 124 virtual bool isOpenDBRequest() const { return false; } -
trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h
r197563 r197566 63 63 static Ref<IDBTransaction> create(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest&); 64 64 65 ~IDBTransaction() overridefinal;65 ~IDBTransaction() final; 66 66 67 67 // IDBTransaction IDL 68 const String& mode() const overridefinal;69 WebCore::IDBDatabase* db() overridefinal;70 RefPtr<DOMError> error() const overridefinal;71 RefPtr<WebCore::IDBObjectStore> objectStore(const String& name, ExceptionCodeWithMessage&) overridefinal;72 void abort(ExceptionCodeWithMessage&) overridefinal;73 74 EventTargetInterface eventTargetInterface() const overridefinal { return IDBTransactionEventTargetInterfaceType; }75 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return ActiveDOMObject::scriptExecutionContext(); }76 void refEventTarget() overridefinal { ref(); }77 void derefEventTarget() overridefinal { deref(); }68 const String& mode() const final; 69 WebCore::IDBDatabase* db() final; 70 RefPtr<DOMError> error() const final; 71 RefPtr<WebCore::IDBObjectStore> objectStore(const String& name, ExceptionCodeWithMessage&) final; 72 void abort(ExceptionCodeWithMessage&) final; 73 74 EventTargetInterface eventTargetInterface() const final { return IDBTransactionEventTargetInterfaceType; } 75 ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); } 76 void refEventTarget() final { ref(); } 77 void derefEventTarget() final { deref(); } 78 78 using EventTarget::dispatchEvent; 79 bool dispatchEvent(Event&) overridefinal;80 81 const char* activeDOMObjectName() const overridefinal;82 bool canSuspendForDocumentSuspension() const overridefinal;83 bool hasPendingActivity() const overridefinal;84 void stop() overridefinal;79 bool dispatchEvent(Event&) final; 80 81 const char* activeDOMObjectName() const final; 82 bool canSuspendForDocumentSuspension() const final; 83 bool hasPendingActivity() const final; 84 void stop() final; 85 85 86 86 const IDBTransactionInfo& info() const { return m_info; } -
trunk/Source/WebCore/Modules/indexeddb/client/IDBVersionChangeEventImpl.h
r197563 r197566 49 49 const IDBResourceIdentifier& requestIdentifier() const { return m_requestIdentifier; } 50 50 51 bool isVersionChangeEvent() const overridefinal { return true; }51 bool isVersionChangeEvent() const final { return true; } 52 52 53 53 private: -
trunk/Source/WebCore/Modules/indexeddb/server/MemoryIDBBackingStore.h
r197563 r197566 45 45 static std::unique_ptr<MemoryIDBBackingStore> create(const IDBDatabaseIdentifier&); 46 46 47 ~MemoryIDBBackingStore() overridefinal;47 ~MemoryIDBBackingStore() final; 48 48 49 IDBError getOrEstablishDatabaseInfo(IDBDatabaseInfo&) overridefinal;49 IDBError getOrEstablishDatabaseInfo(IDBDatabaseInfo&) final; 50 50 void setDatabaseInfo(const IDBDatabaseInfo&); 51 51 52 IDBError beginTransaction(const IDBTransactionInfo&) overridefinal;53 IDBError abortTransaction(const IDBResourceIdentifier& transactionIdentifier) overridefinal;54 IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) overridefinal;55 IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) overridefinal;56 IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) overridefinal;57 IDBError clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) overridefinal;58 IDBError createIndex(const IDBResourceIdentifier& transactionIdentifier, const IDBIndexInfo&) overridefinal;59 IDBError deleteIndex(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier) overridefinal;60 IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) overridefinal;61 IDBError deleteRange(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&) overridefinal;62 IDBError addRecord(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&, const IDBKeyData&, const ThreadSafeDataBuffer& value) overridefinal;63 IDBError getRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&, ThreadSafeDataBuffer& outValue) overridefinal;64 IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) overridefinal;65 IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) overridefinal;66 IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) overridefinal;67 IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) overridefinal;68 IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) overridefinal;69 IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) overridefinal;70 IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) overridefinal;52 IDBError beginTransaction(const IDBTransactionInfo&) final; 53 IDBError abortTransaction(const IDBResourceIdentifier& transactionIdentifier) final; 54 IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) final; 55 IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) final; 56 IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) final; 57 IDBError clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) final; 58 IDBError createIndex(const IDBResourceIdentifier& transactionIdentifier, const IDBIndexInfo&) final; 59 IDBError deleteIndex(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier) final; 60 IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) final; 61 IDBError deleteRange(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&) final; 62 IDBError addRecord(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&, const IDBKeyData&, const ThreadSafeDataBuffer& value) final; 63 IDBError getRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&, ThreadSafeDataBuffer& outValue) final; 64 IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) final; 65 IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) final; 66 IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) final; 67 IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) final; 68 IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) final; 69 IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) final; 70 IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) final; 71 71 72 IDBObjectStoreInfo* infoForObjectStore(uint64_t objectStoreIdentifier) overridefinal;73 void deleteBackingStore() overridefinal;72 IDBObjectStoreInfo* infoForObjectStore(uint64_t objectStoreIdentifier) final; 73 void deleteBackingStore() final; 74 74 75 bool supportsSimultaneousTransactions() overridefinal { return true; }76 bool isEphemeral() overridefinal { return true; }75 bool supportsSimultaneousTransactions() final { return true; } 76 bool isEphemeral() final { return true; } 77 77 78 78 void removeObjectStoreForVersionChangeAbort(MemoryObjectStore&); -
trunk/Source/WebCore/Modules/indexeddb/server/MemoryIndexCursor.h
r197563 r197566 47 47 48 48 private: 49 void currentData(IDBGetResult&) overridefinal;50 void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) overridefinal;49 void currentData(IDBGetResult&) final; 50 void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) final; 51 51 52 52 MemoryIndex& m_index; -
trunk/Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.h
r197563 r197566 49 49 50 50 private: 51 void currentData(IDBGetResult&) overridefinal;52 void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) overridefinal;51 void currentData(IDBGetResult&) final; 52 void iterate(const IDBKeyData&, uint32_t count, IDBGetResult&) final; 53 53 54 54 void setFirstInRemainingRange(std::set<IDBKeyData>&); -
trunk/Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.h
r197563 r197566 50 50 SQLiteIDBBackingStore(const IDBDatabaseIdentifier&, const String& databaseRootDirectory); 51 51 52 ~SQLiteIDBBackingStore() overridefinal;52 ~SQLiteIDBBackingStore() final; 53 53 54 IDBError getOrEstablishDatabaseInfo(IDBDatabaseInfo&) overridefinal;54 IDBError getOrEstablishDatabaseInfo(IDBDatabaseInfo&) final; 55 55 56 IDBError beginTransaction(const IDBTransactionInfo&) overridefinal;57 IDBError abortTransaction(const IDBResourceIdentifier& transactionIdentifier) overridefinal;58 IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) overridefinal;59 IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) overridefinal;60 IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) overridefinal;61 IDBError clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) overridefinal;62 IDBError createIndex(const IDBResourceIdentifier& transactionIdentifier, const IDBIndexInfo&) overridefinal;63 IDBError deleteIndex(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier) overridefinal;64 IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) overridefinal;65 IDBError deleteRange(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&) overridefinal;66 IDBError addRecord(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&, const IDBKeyData&, const ThreadSafeDataBuffer& value) overridefinal;67 IDBError getRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&, ThreadSafeDataBuffer& outValue) overridefinal;68 IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) overridefinal;69 IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) overridefinal;70 IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) overridefinal;71 IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) overridefinal;72 IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) overridefinal;73 IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) overridefinal;74 IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) overridefinal;56 IDBError beginTransaction(const IDBTransactionInfo&) final; 57 IDBError abortTransaction(const IDBResourceIdentifier& transactionIdentifier) final; 58 IDBError commitTransaction(const IDBResourceIdentifier& transactionIdentifier) final; 59 IDBError createObjectStore(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&) final; 60 IDBError deleteObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) final; 61 IDBError clearObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier) final; 62 IDBError createIndex(const IDBResourceIdentifier& transactionIdentifier, const IDBIndexInfo&) final; 63 IDBError deleteIndex(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier) final; 64 IDBError keyExistsInObjectStore(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyData&, bool& keyExists) final; 65 IDBError deleteRange(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&) final; 66 IDBError addRecord(const IDBResourceIdentifier& transactionIdentifier, const IDBObjectStoreInfo&, const IDBKeyData&, const ThreadSafeDataBuffer& value) final; 67 IDBError getRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, const IDBKeyRangeData&, ThreadSafeDataBuffer& outValue) final; 68 IDBError getIndexRecord(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, IndexedDB::IndexRecordType, const IDBKeyRangeData&, IDBGetResult& outValue) final; 69 IDBError getCount(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t indexIdentifier, const IDBKeyRangeData&, uint64_t& outCount) final; 70 IDBError generateKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t& keyNumber) final; 71 IDBError revertGeneratedKeyNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, uint64_t keyNumber) final; 72 IDBError maybeUpdateKeyGeneratorNumber(const IDBResourceIdentifier& transactionIdentifier, uint64_t objectStoreIdentifier, double newKeyNumber) final; 73 IDBError openCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBCursorInfo&, IDBGetResult& outResult) final; 74 IDBError iterateCursor(const IDBResourceIdentifier& transactionIdentifier, const IDBResourceIdentifier& cursorIdentifier, const IDBKeyData&, uint32_t count, IDBGetResult& outResult) final; 75 75 76 IDBObjectStoreInfo* infoForObjectStore(uint64_t objectStoreIdentifier) overridefinal;77 void deleteBackingStore() overridefinal;76 IDBObjectStoreInfo* infoForObjectStore(uint64_t objectStoreIdentifier) final; 77 void deleteBackingStore() final; 78 78 79 bool supportsSimultaneousTransactions() overridefinal { return false; }80 bool isEphemeral() overridefinal { return false; }79 bool supportsSimultaneousTransactions() final { return false; } 80 bool isEphemeral() final { return false; } 81 81 82 82 void unregisterCursor(SQLiteIDBCursor&); -
trunk/Source/WebCore/Modules/indexeddb/shared/InProcessIDBServer.h
r197563 r197566 56 56 57 57 // IDBConnectionToServer 58 void deleteDatabase(IDBRequestData&) overridefinal;59 void openDatabase(IDBRequestData&) overridefinal;60 void abortTransaction(IDBResourceIdentifier&) overridefinal;61 void commitTransaction(IDBResourceIdentifier&) overridefinal;62 void didFinishHandlingVersionChangeTransaction(IDBResourceIdentifier&) overridefinal;63 void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) overridefinal;64 void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) overridefinal;65 void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier) overridefinal;66 void createIndex(const IDBRequestData&, const IDBIndexInfo&) overridefinal;67 void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) overridefinal;68 void putOrAdd(const IDBRequestData&, IDBKey*, SerializedScriptValue&, const IndexedDB::ObjectStoreOverwriteMode) overridefinal;69 void getRecord(const IDBRequestData&, const IDBKeyRangeData&) overridefinal;70 void getCount(const IDBRequestData&, const IDBKeyRangeData&) overridefinal;71 void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&) overridefinal;72 void openCursor(const IDBRequestData&, const IDBCursorInfo&) overridefinal;73 void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count) overridefinal;74 void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) overridefinal;75 void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) overridefinal;76 void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) overridefinal;77 void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier) overridefinal;58 void deleteDatabase(IDBRequestData&) final; 59 void openDatabase(IDBRequestData&) final; 60 void abortTransaction(IDBResourceIdentifier&) final; 61 void commitTransaction(IDBResourceIdentifier&) final; 62 void didFinishHandlingVersionChangeTransaction(IDBResourceIdentifier&) final; 63 void createObjectStore(const IDBRequestData&, const IDBObjectStoreInfo&) final; 64 void deleteObjectStore(const IDBRequestData&, const String& objectStoreName) final; 65 void clearObjectStore(const IDBRequestData&, uint64_t objectStoreIdentifier) final; 66 void createIndex(const IDBRequestData&, const IDBIndexInfo&) final; 67 void deleteIndex(const IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) final; 68 void putOrAdd(const IDBRequestData&, IDBKey*, SerializedScriptValue&, const IndexedDB::ObjectStoreOverwriteMode) final; 69 void getRecord(const IDBRequestData&, const IDBKeyRangeData&) final; 70 void getCount(const IDBRequestData&, const IDBKeyRangeData&) final; 71 void deleteRecord(const IDBRequestData&, const IDBKeyRangeData&) final; 72 void openCursor(const IDBRequestData&, const IDBCursorInfo&) final; 73 void iterateCursor(const IDBRequestData&, const IDBKeyData&, unsigned long count) final; 74 void establishTransaction(uint64_t databaseConnectionIdentifier, const IDBTransactionInfo&) final; 75 void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) final; 76 void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& transactionIdentifier) final; 77 void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const IDBResourceIdentifier& requestIdentifier) final; 78 78 79 79 // IDBConnectionToClient 80 80 uint64_t identifier() const override; 81 void didDeleteDatabase(const IDBResultData&) overridefinal;82 void didOpenDatabase(const IDBResultData&) overridefinal;83 void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) overridefinal;84 void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) overridefinal;85 void didCreateObjectStore(const IDBResultData&) overridefinal;86 void didDeleteObjectStore(const IDBResultData&) overridefinal;87 void didClearObjectStore(const IDBResultData&) overridefinal;88 void didCreateIndex(const IDBResultData&) overridefinal;89 void didDeleteIndex(const IDBResultData&) overridefinal;90 void didPutOrAdd(const IDBResultData&) overridefinal;91 void didGetRecord(const IDBResultData&) overridefinal;92 void didGetCount(const IDBResultData&) overridefinal;93 void didDeleteRecord(const IDBResultData&) overridefinal;94 void didOpenCursor(const IDBResultData&) overridefinal;95 void didIterateCursor(const IDBResultData&) overridefinal;96 void fireVersionChangeEvent(IDBServer::UniqueIDBDatabaseConnection&, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion) overridefinal;97 void didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) overridefinal;98 void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion) overridefinal;81 void didDeleteDatabase(const IDBResultData&) final; 82 void didOpenDatabase(const IDBResultData&) final; 83 void didAbortTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) final; 84 void didCommitTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) final; 85 void didCreateObjectStore(const IDBResultData&) final; 86 void didDeleteObjectStore(const IDBResultData&) final; 87 void didClearObjectStore(const IDBResultData&) final; 88 void didCreateIndex(const IDBResultData&) final; 89 void didDeleteIndex(const IDBResultData&) final; 90 void didPutOrAdd(const IDBResultData&) final; 91 void didGetRecord(const IDBResultData&) final; 92 void didGetCount(const IDBResultData&) final; 93 void didDeleteRecord(const IDBResultData&) final; 94 void didOpenCursor(const IDBResultData&) final; 95 void didIterateCursor(const IDBResultData&) final; 96 void fireVersionChangeEvent(IDBServer::UniqueIDBDatabaseConnection&, const IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion) final; 97 void didStartTransaction(const IDBResourceIdentifier& transactionIdentifier, const IDBError&) final; 98 void notifyOpenDBRequestBlocked(const IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion) final; 99 99 100 100 void ref() override { RefCounted<InProcessIDBServer>::ref(); } -
trunk/Source/WebCore/Modules/mediasession/MediaRemoteControls.h
r197563 r197566 69 69 MediaSession* m_session { nullptr }; 70 70 71 void refEventTarget() overridefinal { ref(); }72 void derefEventTarget() overridefinal { deref(); }71 void refEventTarget() final { ref(); } 72 void derefEventTarget() final { deref(); } 73 73 }; 74 74 -
trunk/Source/WebCore/Modules/mediasource/MediaSource.h
r197563 r197566 101 101 102 102 // EventTarget interface 103 ScriptExecutionContext* scriptExecutionContext() const overridefinal;104 void refEventTarget() overridefinal { ref(); }105 void derefEventTarget() overridefinal { deref(); }103 ScriptExecutionContext* scriptExecutionContext() const final; 104 void refEventTarget() final { ref(); } 105 void derefEventTarget() final { deref(); } 106 106 EventTargetInterface eventTargetInterface() const override; 107 107 -
trunk/Source/WebCore/Modules/mediastream/MediaDevicesRequest.h
r197114 r197566 65 65 66 66 // ContextDestructionObserver 67 void contextDestroyed() overridefinal;67 void contextDestroyed() final; 68 68 69 69 // UserMediaPermissionCheckClient 70 void didCompletePermissionCheck(const String&, bool) overridefinal;70 void didCompletePermissionCheck(const String&, bool) final; 71 71 72 72 String hashID(const String&); -
trunk/Source/WebCore/Modules/mediastream/MediaStream.h
r197563 r197566 76 76 77 77 // EventTarget 78 virtualEventTargetInterface eventTargetInterface() const final { return MediaStreamEventTargetInterfaceType; }79 virtualScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); }78 EventTargetInterface eventTargetInterface() const final { return MediaStreamEventTargetInterfaceType; } 79 ScriptExecutionContext* scriptExecutionContext() const final { return ContextDestructionObserver::scriptExecutionContext(); } 80 80 81 81 using RefCounted<MediaStream>::ref; … … 93 93 94 94 // ContextDestructionObserver 95 void contextDestroyed() overridefinal;95 void contextDestroyed() final; 96 96 97 97 private: … … 99 99 100 100 // EventTarget 101 void refEventTarget() overridefinal { ref(); }102 void derefEventTarget() overridefinal { deref(); }101 void refEventTarget() final { ref(); } 102 void derefEventTarget() final { deref(); } 103 103 104 104 // MediaStreamTrack::Observer 105 void trackDidEnd() overridefinal;105 void trackDidEnd() final; 106 106 107 107 // MediaStreamPrivate::Observer 108 void activeStatusChanged() overridefinal;109 void didAddTrack(MediaStreamTrackPrivate&) overridefinal;110 void didRemoveTrack(MediaStreamTrackPrivate&) overridefinal;108 void activeStatusChanged() final; 109 void didAddTrack(MediaStreamTrackPrivate&) final; 110 void didRemoveTrack(MediaStreamTrackPrivate&) final; 111 111 112 112 bool internalAddTrack(RefPtr<MediaStreamTrack>&&, StreamModifier); -
trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h
r197563 r197566 93 93 94 94 // EventTarget 95 EventTargetInterface eventTargetInterface() const overridefinal { return MediaStreamTrackEventTargetInterfaceType; }96 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return ActiveDOMObject::scriptExecutionContext(); }95 EventTargetInterface eventTargetInterface() const final { return MediaStreamTrackEventTargetInterfaceType; } 96 ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); } 97 97 98 98 using RefCounted<MediaStreamTrack>::ref; … … 106 106 107 107 // ActiveDOMObject API. 108 void stop() overridefinal;109 const char* activeDOMObjectName() const overridefinal;110 bool canSuspendForDocumentSuspension() const overridefinal;108 void stop() final; 109 const char* activeDOMObjectName() const final; 110 bool canSuspendForDocumentSuspension() const final; 111 111 112 112 // EventTarget 113 void refEventTarget() overridefinal { ref(); }114 void derefEventTarget() overridefinal { deref(); }113 void refEventTarget() final { ref(); } 114 void derefEventTarget() final { deref(); } 115 115 116 116 // MediaStreamTrackPrivate::Observer -
trunk/Source/WebCore/Modules/mediastream/UserMediaPermissionCheck.h
r197563 r197566 67 67 68 68 // ContextDestructionObserver 69 void contextDestroyed() overridefinal;69 void contextDestroyed() final; 70 70 71 71 UserMediaPermissionCheckClient* m_client; -
trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h
r197563 r197566 78 78 79 79 // MediaStreamCreationClient 80 void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& audioTracks, const Vector<RefPtr<RealtimeMediaSource>>& videoTracks) overridefinal;81 void constraintsInvalid(const String& constraintName) overridefinal;82 void didCreateStream(PassRefPtr<MediaStreamPrivate>) overridefinal;83 void failedToCreateStreamWithConstraintsError(const String& constraintName) overridefinal;84 void failedToCreateStreamWithPermissionError() overridefinal;80 void constraintsValidated(const Vector<RefPtr<RealtimeMediaSource>>& audioTracks, const Vector<RefPtr<RealtimeMediaSource>>& videoTracks) final; 81 void constraintsInvalid(const String& constraintName) final; 82 void didCreateStream(PassRefPtr<MediaStreamPrivate>) final; 83 void failedToCreateStreamWithConstraintsError(const String& constraintName) final; 84 void failedToCreateStreamWithPermissionError() final; 85 85 86 86 // ContextDestructionObserver 87 void contextDestroyed() overridefinal;87 void contextDestroyed() final; 88 88 89 89 RefPtr<MediaConstraints> m_audioConstraints; -
trunk/Source/WebCore/Modules/webaudio/AudioContext.h
r197563 r197566 241 241 242 242 // EventTarget 243 EventTargetInterface eventTargetInterface() const overridefinal { return AudioContextEventTargetInterfaceType; }244 ScriptExecutionContext* scriptExecutionContext() const overridefinal;243 EventTargetInterface eventTargetInterface() const final { return AudioContextEventTargetInterfaceType; } 244 ScriptExecutionContext* scriptExecutionContext() const final; 245 245 246 246 // Reconcile ref/deref which are defined both in ThreadSafeRefCounted and EventTarget. -
trunk/Source/WebCore/Modules/webaudio/AudioNode.h
r197563 r197566 181 181 // EventTarget 182 182 EventTargetInterface eventTargetInterface() const override; 183 ScriptExecutionContext* scriptExecutionContext() const overridefinal;183 ScriptExecutionContext* scriptExecutionContext() const final; 184 184 185 185 protected: -
trunk/Source/WebCore/accessibility/AccessibilityMockObject.h
r197563 r197566 49 49 50 50 private: 51 bool isMockObject() const overridefinal { return true; }51 bool isMockObject() const final { return true; } 52 52 bool isDetachedFromParent() override { return !m_parent; } 53 53 -
trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h
r197563 r197566 130 130 void colorValue(int& r, int& g, int& b) const override; 131 131 String ariaLabeledByAttribute() const override; 132 bool hasAttributesRequiredForInclusion() const overridefinal;132 bool hasAttributesRequiredForInclusion() const final; 133 133 void setIsExpanded(bool) override; 134 134 … … 194 194 195 195 private: 196 bool isAccessibilityNodeObject() const overridefinal { return true; }196 bool isAccessibilityNodeObject() const final { return true; } 197 197 void accessibilityText(Vector<AccessibilityText>&) override; 198 198 virtual void titleElementText(Vector<AccessibilityText>&) const; -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h
r197563 r197566 226 226 227 227 private: 228 bool isAccessibilityRenderObject() const overridefinal { return true; }228 bool isAccessibilityRenderObject() const final { return true; } 229 229 void ariaListboxSelectedChildren(AccessibilityChildrenVector&); 230 230 void ariaListboxVisibleChildren(AccessibilityChildrenVector&); -
trunk/Source/WebCore/accessibility/AccessibilitySlider.h
r197563 r197566 50 50 51 51 AccessibilityRole roleValue() const override { return SliderRole; } 52 bool isSlider() const overridefinal { return true; }52 bool isSlider() const final { return true; } 53 53 bool isInputSlider() const override { return true; } 54 54 bool isControl() const override { return true; } -
trunk/Source/WebCore/accessibility/AccessibilityTable.h
r197563 r197566 44 44 virtual ~AccessibilityTable(); 45 45 46 void init() overridefinal;46 void init() final; 47 47 48 AccessibilityRole roleValue() const overridefinal;48 AccessibilityRole roleValue() const final; 49 49 virtual bool isAriaTable() const { return false; } 50 50 51 51 void addChildren() override; 52 void clearChildren() overridefinal;52 void clearChildren() final; 53 53 54 54 const AccessibilityChildrenVector& columns(); … … 58 58 unsigned columnCount(); 59 59 unsigned rowCount(); 60 int tableLevel() const overridefinal;60 int tableLevel() const final; 61 61 62 String title() const overridefinal;62 String title() const final; 63 63 64 64 // all the cells in the table … … 91 91 92 92 // isTable is whether it's an AccessibilityTable object. 93 bool isTable() const overridefinal { return true; }93 bool isTable() const final { return true; } 94 94 // isDataTable is whether it is exposed as an AccessibilityTable because the heuristic 95 95 // think this "looks" like a data-based table (instead of a table used for layout). 96 bool isDataTable() const overridefinal;97 bool computeAccessibilityIsIgnored() const overridefinal;96 bool isDataTable() const final; 97 bool computeAccessibilityIsIgnored() const final; 98 98 99 99 private: 100 100 virtual bool computeIsTableExposableThroughAccessibility() const; 101 void titleElementText(Vector<AccessibilityText>&) const overridefinal;101 void titleElementText(Vector<AccessibilityText>&) const final; 102 102 HTMLTableElement* tableElement() const; 103 103 void addChildrenFromSection(RenderTableSection*, unsigned& maxColumnCount); -
trunk/Source/WebCore/accessibility/AccessibilityTableCell.h
r197563 r197566 42 42 virtual ~AccessibilityTableCell(); 43 43 44 bool isTableCell() const overridefinal;44 bool isTableCell() const final; 45 45 bool isTableHeaderCell() const; 46 46 bool isColumnHeaderCell() const; … … 66 66 AccessibilityTableRow* parentRow() const; 67 67 virtual AccessibilityTable* parentTable() const; 68 AccessibilityRole determineAccessibilityRole() overridefinal;68 AccessibilityRole determineAccessibilityRole() final; 69 69 70 70 int m_rowIndex; … … 73 73 private: 74 74 // If a table cell is not exposed as a table cell, a TH element can serve as its title UI element. 75 AccessibilityObject* titleUIElement() const overridefinal;76 bool exposesTitleUIElement() const overridefinal { return true; }77 bool computeAccessibilityIsIgnored() const overridefinal;78 String expandedTextValue() const overridefinal;79 bool supportsExpandedTextValue() const overridefinal;75 AccessibilityObject* titleUIElement() const final; 76 bool exposesTitleUIElement() const final { return true; } 77 bool computeAccessibilityIsIgnored() const final; 78 String expandedTextValue() const final; 79 bool supportsExpandedTextValue() const final; 80 80 81 81 bool isTableCellInSameRowGroup(AccessibilityTableCell*); -
trunk/Source/WebCore/accessibility/AccessibilityTableRow.h
r197563 r197566 60 60 explicit AccessibilityTableRow(RenderObject*); 61 61 62 AccessibilityRole determineAccessibilityRole() overridefinal;62 AccessibilityRole determineAccessibilityRole() final; 63 63 64 64 private: 65 bool isTableRow() const overridefinal;66 AccessibilityObject* observableObject() const overridefinal;67 bool computeAccessibilityIsIgnored() const overridefinal;65 bool isTableRow() const final; 66 AccessibilityObject* observableObject() const final; 67 bool computeAccessibilityIsIgnored() const final; 68 68 69 69 int m_rowIndex; -
trunk/Source/WebCore/css/PropertySetCSSStyleDeclaration.h
r197563 r197566 53 53 private: 54 54 CSSRule* parentRule() const override { return nullptr; } 55 unsigned length() const overridefinal;56 String item(unsigned index) const overridefinal;57 RefPtr<CSSValue> getPropertyCSSValue(const String& propertyName) overridefinal;58 String getPropertyValue(const String& propertyName) overridefinal;59 String getPropertyPriority(const String& propertyName) overridefinal;60 String getPropertyShorthand(const String& propertyName) overridefinal;61 bool isPropertyImplicit(const String& propertyName) overridefinal;62 void setProperty(const String& propertyName, const String& value, const String& priority, ExceptionCode&) overridefinal;63 String removeProperty(const String& propertyName, ExceptionCode&) overridefinal;64 String cssText() const overridefinal;65 void setCssText(const String&, ExceptionCode&) overridefinal;66 RefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) overridefinal;67 String getPropertyValueInternal(CSSPropertyID) overridefinal;68 bool setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) overridefinal;55 unsigned length() const final; 56 String item(unsigned index) const final; 57 RefPtr<CSSValue> getPropertyCSSValue(const String& propertyName) final; 58 String getPropertyValue(const String& propertyName) final; 59 String getPropertyPriority(const String& propertyName) final; 60 String getPropertyShorthand(const String& propertyName) final; 61 bool isPropertyImplicit(const String& propertyName) final; 62 void setProperty(const String& propertyName, const String& value, const String& priority, ExceptionCode&) final; 63 String removeProperty(const String& propertyName, ExceptionCode&) final; 64 String cssText() const final; 65 void setCssText(const String&, ExceptionCode&) final; 66 RefPtr<CSSValue> getPropertyCSSValueInternal(CSSPropertyID) final; 67 String getPropertyValueInternal(CSSPropertyID) final; 68 bool setPropertyInternal(CSSPropertyID, const String& value, bool important, ExceptionCode&) final; 69 69 70 Ref<MutableStyleProperties> copyProperties() const overridefinal;70 Ref<MutableStyleProperties> copyProperties() const final; 71 71 72 72 CSSValue* cloneAndCacheForCSSOM(CSSValue*); -
trunk/Source/WebCore/dom/CharacterData.h
r197563 r197566 64 64 65 65 private: 66 String nodeValue() const overridefinal;67 void setNodeValue(const String&, ExceptionCode&) overridefinal;68 bool isCharacterDataNode() const overridefinal { return true; }69 int maxCharacterOffset() const overridefinal;70 bool offsetInCharacters() const overridefinal;66 String nodeValue() const final; 67 void setNodeValue(const String&, ExceptionCode&) final; 68 bool isCharacterDataNode() const final { return true; } 69 int maxCharacterOffset() const final; 70 bool offsetInCharacters() const final; 71 71 void setDataAndUpdate(const String&, unsigned offsetOfReplacedData, unsigned oldLength, unsigned newLength); 72 72 void checkCharDataOperation(unsigned offset, ExceptionCode&); -
trunk/Source/WebCore/dom/Document.h
r197563 r197566 342 342 using ContainerNode::deref; 343 343 344 bool canContainRangeEndPoint() const overridefinal { return true; }344 bool canContainRangeEndPoint() const final { return true; } 345 345 346 346 Element* getElementByAccessKey(const String& key); … … 596 596 597 597 // Override ScriptExecutionContext methods to do additional work 598 bool shouldBypassMainWorldContentSecurityPolicy() const overridefinal;599 void suspendActiveDOMObjects(ActiveDOMObject::ReasonForSuspension) overridefinal;600 void resumeActiveDOMObjects(ActiveDOMObject::ReasonForSuspension) overridefinal;601 void stopActiveDOMObjects() overridefinal;598 bool shouldBypassMainWorldContentSecurityPolicy() const final; 599 void suspendActiveDOMObjects(ActiveDOMObject::ReasonForSuspension) final; 600 void resumeActiveDOMObjects(ActiveDOMObject::ReasonForSuspension) final; 601 void stopActiveDOMObjects() final; 602 602 603 603 void suspendDeviceMotionAndOrientationUpdates(); … … 641 641 bool wellFormed() const { return m_wellFormed; } 642 642 643 const URL& url() const overridefinal { return m_url; }643 const URL& url() const final { return m_url; } 644 644 void setURL(const URL&); 645 645 const URL& urlForBindings() const { return m_url.isEmpty() ? blankURL() : m_url; } … … 654 654 void processBaseElement(); 655 655 656 WEBCORE_EXPORT URL completeURL(const String&) const overridefinal;656 WEBCORE_EXPORT URL completeURL(const String&) const final; 657 657 URL completeURL(const String&, const URL& baseURLOverride) const; 658 658 659 String userAgent(const URL&) const overridefinal;660 661 void disableEval(const String& errorMessage) overridefinal;659 String userAgent(const URL&) const final; 660 661 void disableEval(const String& errorMessage) final; 662 662 663 663 bool canNavigate(Frame* targetFrame); … … 979 979 void parseDNSPrefetchControlHeader(const String&); 980 980 981 void postTask(Task) overridefinal; // Executes the task on context's thread asynchronously.981 void postTask(Task) final; // Executes the task on context's thread asynchronously. 982 982 983 983 #if ENABLE(REQUEST_ANIMATION_FRAME) … … 1068 1068 #endif 1069 1069 1070 void removeAllEventListeners() overridefinal;1070 void removeAllEventListeners() final; 1071 1071 1072 1072 WEBCORE_EXPORT const SVGDocumentExtensions* svgExtensions(); … … 1082 1082 bool loadEventFinished() const { return m_loadEventFinished; } 1083 1083 1084 bool isContextThread() const overridefinal;1085 bool isJSExecutionForbidden() const overridefinal { return false; }1084 bool isContextThread() const final; 1085 bool isJSExecutionForbidden() const final { return false; } 1086 1086 1087 1087 void enqueueWindowEvent(Ref<Event>&&); … … 1091 1091 void enqueueHashchangeEvent(const String& oldURL, const String& newURL); 1092 1092 void enqueuePopstateEvent(RefPtr<SerializedScriptValue>&& stateObject); 1093 DocumentEventQueue& eventQueue() const overridefinal { return m_eventQueue; }1093 DocumentEventQueue& eventQueue() const final { return m_eventQueue; } 1094 1094 1095 1095 WEBCORE_EXPORT void addMediaCanStartListener(MediaCanStartListener*); … … 1165 1165 void sendWillRevealEdgeEventsIfNeeded(const IntPoint& oldPosition, const IntPoint& newPosition, const IntRect& visibleRect, const IntSize& contentsSize, Element* target = nullptr); 1166 1166 1167 EventTarget* errorEventTarget() overridefinal;1168 void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) overridefinal;1167 EventTarget* errorEventTarget() final; 1168 void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, RefPtr<Inspector::ScriptCallStack>&&) final; 1169 1169 1170 1170 void initDNSPrefetch(); … … 1213 1213 RegionFixedPair absoluteRegionForEventTargets(const EventTargetSet*); 1214 1214 1215 LayoutRect absoluteEventHandlerBounds(bool&) overridefinal;1215 LayoutRect absoluteEventHandlerBounds(bool&) final; 1216 1216 1217 1217 bool visualUpdatesAllowed() const { return m_visualUpdatesAllowed; } … … 1260 1260 void removeDisabledFieldsetElement() { ASSERT(m_disabledFieldsetElementsCount); m_disabledFieldsetElementsCount--; } 1261 1261 1262 WEBCORE_EXPORT void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) overridefinal;1263 1264 WEBCORE_EXPORT SecurityOrigin* topOrigin() const overridefinal;1262 WEBCORE_EXPORT void addConsoleMessage(MessageSource, MessageLevel, const String& message, unsigned long requestIdentifier = 0) final; 1263 1264 WEBCORE_EXPORT SecurityOrigin* topOrigin() const final; 1265 1265 1266 1266 Ref<FontFaceSet> fonts(); … … 1271 1271 1272 1272 #if ENABLE(SUBTLE_CRYPTO) 1273 bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) overridefinal;1274 bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) overridefinal;1273 bool wrapCryptoKey(const Vector<uint8_t>& key, Vector<uint8_t>& wrappedKey) final; 1274 bool unwrapCryptoKey(const Vector<uint8_t>& wrappedKey, Vector<uint8_t>& key) final; 1275 1275 #endif 1276 1276 … … 1339 1339 1340 1340 // FontSelectorClient 1341 void fontsNeedUpdate(FontSelector&) overridefinal;1342 1343 bool isDocument() const overridefinal { return true; }1344 1345 void childrenChanged(const ChildChange&) overridefinal;1346 1347 String nodeName() const overridefinal;1348 NodeType nodeType() const overridefinal;1349 bool childTypeAllowed(NodeType) const overridefinal;1350 Ref<Node> cloneNodeInternal(Document&, CloningOperation) overridefinal;1341 void fontsNeedUpdate(FontSelector&) final; 1342 1343 bool isDocument() const final { return true; } 1344 1345 void childrenChanged(const ChildChange&) final; 1346 1347 String nodeName() const final; 1348 NodeType nodeType() const final; 1349 bool childTypeAllowed(NodeType) const final; 1350 Ref<Node> cloneNodeInternal(Document&, CloningOperation) final; 1351 1351 void cloneDataFromDocument(const Document&); 1352 1352 1353 void refScriptExecutionContext() overridefinal { ref(); }1354 void derefScriptExecutionContext() overridefinal { deref(); }1355 1356 void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0) overridefinal;1357 1358 double minimumTimerInterval() const overridefinal;1359 1360 double timerAlignmentInterval(bool hasReachedMaxNestingLevel) const overridefinal;1353 void refScriptExecutionContext() final { ref(); } 1354 void derefScriptExecutionContext() final { deref(); } 1355 1356 void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = nullptr, unsigned long requestIdentifier = 0) final; 1357 1358 double minimumTimerInterval() const final; 1359 1360 double timerAlignmentInterval(bool hasReachedMaxNestingLevel) const final; 1361 1361 1362 1362 void updateTitleFromTitleElement(); … … 1408 1408 bool isDOMCookieCacheValid() const { return m_cookieCacheExpiryTimer.isActive(); } 1409 1409 void invalidateDOMCookieCache(); 1410 void didLoadResourceSynchronously(const ResourceRequest&) overridefinal;1410 void didLoadResourceSynchronously(const ResourceRequest&) final; 1411 1411 1412 1412 void checkViewportDependentPictures(); -
trunk/Source/WebCore/dom/DocumentFragment.h
r197563 r197566 37 37 bool parseXML(const String&, Element* contextElement, ParserContentPolicy = AllowScriptingContent); 38 38 39 bool canContainRangeEndPoint() const overridefinal { return true; }39 bool canContainRangeEndPoint() const final { return true; } 40 40 virtual bool isTemplateContent() const { return false; } 41 41 … … 45 45 protected: 46 46 DocumentFragment(Document&, ConstructionType = CreateContainer); 47 String nodeName() const overridefinal;47 String nodeName() const final; 48 48 49 49 private: 50 NodeType nodeType() const overridefinal;50 NodeType nodeType() const final; 51 51 Ref<Node> cloneNodeInternal(Document&, CloningOperation) override; 52 52 bool childTypeAllowed(NodeType) const override; -
trunk/Source/WebCore/dom/Element.h
r197563 r197566 195 195 bool hasLocalName(const AtomicString& other) const { return m_tagName.localName() == other; } 196 196 197 const AtomicString& localName() const overridefinal { return m_tagName.localName(); }198 const AtomicString& prefix() const overridefinal { return m_tagName.prefix(); }199 const AtomicString& namespaceURI() const overridefinal { return m_tagName.namespaceURI(); }197 const AtomicString& localName() const final { return m_tagName.localName(); } 198 const AtomicString& prefix() const final { return m_tagName.prefix(); } 199 const AtomicString& namespaceURI() const final { return m_tagName.namespaceURI(); } 200 200 201 201 String nodeName() const override; … … 373 373 bool isFinishedParsingChildren() const { return isParsingChildrenFinished(); } 374 374 void finishParsingChildren() override; 375 void beginParsingChildren() overridefinal;375 void beginParsingChildren() final; 376 376 377 377 WEBCORE_EXPORT PseudoElement* beforePseudoElement() const; … … 512 512 void removedFrom(ContainerNode&) override; 513 513 void childrenChanged(const ChildChange&) override; 514 void removeAllEventListeners() overridefinal;514 void removeAllEventListeners() final; 515 515 virtual void parserDidSetAttributes(); 516 516 … … 565 565 void scrollByUnits(int units, ScrollGranularity); 566 566 567 void setPrefix(const AtomicString&, ExceptionCode&) overridefinal;568 NodeType nodeType() const overridefinal;569 bool childTypeAllowed(NodeType) const overridefinal;567 void setPrefix(const AtomicString&, ExceptionCode&) final; 568 NodeType nodeType() const final; 569 bool childTypeAllowed(NodeType) const final; 570 570 571 571 void setAttributeInternal(unsigned index, const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute); -
trunk/Source/WebCore/dom/EventTarget.h
r197563 r197566 162 162 class EventTargetWithInlineData : public EventTarget { 163 163 protected: 164 EventTargetData* eventTargetData() overridefinal { return &m_eventTargetData; }165 EventTargetData& ensureEventTargetData() overridefinal { return m_eventTargetData; }164 EventTargetData* eventTargetData() final { return &m_eventTargetData; } 165 EventTargetData& ensureEventTargetData() final { return m_eventTargetData; } 166 166 private: 167 167 EventTargetData m_eventTargetData; -
trunk/Source/WebCore/dom/LiveNodeList.h
r197563 r197566 65 65 66 66 private: 67 bool isLiveNodeList() const overridefinal { return true; }67 bool isLiveNodeList() const final { return true; } 68 68 69 69 ContainerNode& rootNode() const; … … 80 80 virtual ~CachedLiveNodeList(); 81 81 82 unsigned length() const overridefinal { return m_indexCache.nodeCount(nodeList()); }82 unsigned length() const final { return m_indexCache.nodeCount(nodeList()); } 83 83 Element* item(unsigned offset) const override { return m_indexCache.nodeAt(nodeList(), offset); } 84 84 … … 92 92 void willValidateIndexCache() const { document().registerNodeListForInvalidation(const_cast<CachedLiveNodeList<NodeListType>&>(*this)); } 93 93 94 void invalidateCache(Document&) const overridefinal;95 size_t memoryCost() const overridefinal { return m_indexCache.memoryCost(); }94 void invalidateCache(Document&) const final; 95 size_t memoryCost() const final { return m_indexCache.memoryCost(); } 96 96 97 97 protected: -
trunk/Source/WebCore/dom/MouseEvent.h
r197563 r197566 82 82 unsigned short button() const { return m_button; } 83 83 bool buttonDown() const { return m_buttonDown; } 84 EventTarget* relatedTarget() const overridefinal { return m_relatedTarget.get(); }84 EventTarget* relatedTarget() const final { return m_relatedTarget.get(); } 85 85 void setRelatedTarget(PassRefPtr<EventTarget> relatedTarget) { m_relatedTarget = relatedTarget; } 86 86 double force() const { return m_force; } -
trunk/Source/WebCore/dom/MouseRelatedEvent.h
r197563 r197566 55 55 WEBCORE_EXPORT int offsetY(); 56 56 bool isSimulated() const { return m_isSimulated; } 57 int pageX() const overridefinal;58 int pageY() const overridefinal;57 int pageX() const final; 58 int pageY() const final; 59 59 virtual const LayoutPoint& pageLocation() const; 60 60 int x() const; … … 78 78 void initCoordinates(); 79 79 void initCoordinates(const LayoutPoint& clientLocation); 80 void receivedTarget() overridefinal;80 void receivedTarget() final; 81 81 82 82 void computePageLocation(); -
trunk/Source/WebCore/dom/Node.h
r197563 r197566 498 498 499 499 EventTargetInterface eventTargetInterface() const override; 500 ScriptExecutionContext* scriptExecutionContext() const overridefinal; // Implemented in Document.h500 ScriptExecutionContext* scriptExecutionContext() const final; // Implemented in Document.h 501 501 502 502 bool addEventListener(const AtomicString& eventType, RefPtr<EventListener>&&, bool useCapture) override; … … 542 542 #endif 543 543 544 EventTargetData* eventTargetData() overridefinal;545 EventTargetData& ensureEventTargetData() overridefinal;544 EventTargetData* eventTargetData() final; 545 EventTargetData& ensureEventTargetData() final; 546 546 547 547 void getRegisteredMutationObserversOfType(HashMap<MutationObserver*, MutationRecordDeliveryOptions>&, MutationObserver::MutationType, const QualifiedName* attributeName); -
trunk/Source/WebCore/dom/ScriptableDocumentParser.h
r197563 r197566 60 60 61 61 private: 62 ScriptableDocumentParser* asScriptableDocumentParser() overridefinal { return this; }62 ScriptableDocumentParser* asScriptableDocumentParser() final { return this; } 63 63 64 64 // http://www.whatwg.org/specs/web-apps/current-work/#script-created-parser -
trunk/Source/WebCore/dom/StyledElement.h
r197563 r197566 59 59 void synchronizeStyleAttributeInternal() const { StyledElement::synchronizeStyleAttributeInternal(const_cast<StyledElement*>(this)); } 60 60 61 CSSStyleDeclaration* cssomStyle() overridefinal;61 CSSStyleDeclaration* cssomStyle() final; 62 62 63 63 const StyleProperties* presentationAttributeStyle(); -
trunk/Source/WebCore/dom/Text.h
r197563 r197566 50 50 RenderPtr<RenderText> createTextRenderer(const RenderStyle&); 51 51 52 bool canContainRangeEndPoint() const overridefinal { return true; }52 bool canContainRangeEndPoint() const final { return true; } 53 53 54 54 RenderText* renderer() const; -
trunk/Source/WebCore/dom/UIEvent.h
r197563 r197566 78 78 79 79 private: 80 bool isUIEvent() const overridefinal;80 bool isUIEvent() const final; 81 81 82 82 RefPtr<AbstractView> m_view; -
trunk/Source/WebCore/html/CachedHTMLCollection.h
r197563 r197566 40 40 virtual ~CachedHTMLCollection(); 41 41 42 unsigned length() const overridefinal { return m_indexCache.nodeCount(collection()); }42 unsigned length() const final { return m_indexCache.nodeCount(collection()); } 43 43 Element* item(unsigned offset) const override { return m_indexCache.nodeAt(collection(), offset); } 44 44 Element* namedItem(const AtomicString& name) const override; 45 size_t memoryCost() const overridefinal { return m_indexCache.memoryCost() + HTMLCollection::memoryCost(); }45 size_t memoryCost() const final { return m_indexCache.memoryCost() + HTMLCollection::memoryCost(); } 46 46 47 47 // For CollectionIndexCache; do not use elsewhere. -
trunk/Source/WebCore/html/FormAssociatedElement.h
r197563 r197566 113 113 void resetFormAttributeTargetObserver(); 114 114 115 bool isFormAssociatedElement() const overridefinal { return true; }115 bool isFormAssociatedElement() const final { return true; } 116 116 117 117 std::unique_ptr<FormAttributeTargetObserver> m_formAttributeTargetObserver; -
trunk/Source/WebCore/html/HTMLAnchorElement.h
r197563 r197566 104 104 bool isLiveLink() const; 105 105 106 bool willRespondToMouseClickEvents() overridefinal;106 bool willRespondToMouseClickEvents() final; 107 107 108 108 bool hasRel(uint32_t relation) const; … … 122 122 bool isMouseFocusable() const override; 123 123 bool isKeyboardFocusable(KeyboardEvent*) const override; 124 void defaultEventHandler(Event*) overridefinal;125 void setActive(bool active = true, bool pause = false) overridefinal;126 void accessKeyAction(bool sendMouseEvents) overridefinal;127 bool isURLAttribute(const Attribute&) const overridefinal;128 bool canStartSelection() const overridefinal;124 void defaultEventHandler(Event*) final; 125 void setActive(bool active = true, bool pause = false) final; 126 void accessKeyAction(bool sendMouseEvents) final; 127 bool isURLAttribute(const Attribute&) const final; 128 bool canStartSelection() const final; 129 129 String target() const override; 130 short tabIndex() const overridefinal;131 bool draggable() const overridefinal;130 short tabIndex() const final; 131 bool draggable() const final; 132 132 133 133 void sendPings(const URL& destinationURL); -
trunk/Source/WebCore/html/HTMLButtonElement.h
r197563 r197566 50 50 // HTMLFormControlElement always creates one, but buttons don't need it. 51 51 bool alwaysCreateUserAgentShadowRoot() const override { return false; } 52 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }52 bool canHaveUserAgentShadowRoot() const final { return true; } 53 53 54 54 void parseAttribute(const QualifiedName&, const AtomicString&) override; -
trunk/Source/WebCore/html/HTMLDetailsElement.h
r197563 r197566 43 43 44 44 void didAddUserAgentShadowRoot(ShadowRoot*) override; 45 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }45 bool canHaveUserAgentShadowRoot() const final { return true; } 46 46 47 47 bool m_isOpen { false }; -
trunk/Source/WebCore/html/HTMLDocument.h
r197563 r197566 89 89 bool isFrameSet() const override; 90 90 Ref<DocumentParser> createParser() override; 91 Ref<Document> cloneDocumentWithoutChildren() const overridefinal;91 Ref<Document> cloneDocumentWithoutChildren() const final; 92 92 93 93 DocumentOrderedMap m_documentNamedItem; -
trunk/Source/WebCore/html/HTMLElement.h
r197563 r197566 43 43 static Ref<HTMLElement> create(const QualifiedName& tagName, Document&); 44 44 45 WEBCORE_EXPORT String title() const overridefinal;45 WEBCORE_EXPORT String title() const final; 46 46 47 47 short tabIndex() const override; … … 126 126 127 127 private: 128 String nodeName() const overridefinal;128 String nodeName() const final; 129 129 130 130 void mapLanguageAttributeToLocale(const AtomicString&, MutableStyleProperties&); -
trunk/Source/WebCore/html/HTMLFormControlElement.h
r197563 r197566 102 102 #endif 103 103 104 bool willValidate() const overridefinal;104 bool willValidate() const final; 105 105 void updateVisibleValidationMessage(); 106 106 void hideVisibleValidationMessage(); … … 164 164 bool matchesInvalidPseudoClass() const override; 165 165 166 bool isFormControlElement() const overridefinal { return true; }166 bool isFormControlElement() const final { return true; } 167 167 bool alwaysCreateUserAgentShadowRoot() const override { return true; } 168 168 169 short tabIndex() const overridefinal;169 short tabIndex() const final; 170 170 171 171 HTMLFormElement* virtualForm() const override; … … 174 174 bool computeIsDisabledByFieldsetAncestor() const; 175 175 176 HTMLElement& asHTMLElement() overridefinal { return *this; }177 const HTMLFormControlElement& asHTMLElement() const overridefinal { return *this; }178 HTMLFormControlElement* asFormNamedItem() overridefinal { return this; }176 HTMLElement& asHTMLElement() final { return *this; } 177 const HTMLFormControlElement& asHTMLElement() const final { return *this; } 178 HTMLFormControlElement* asFormNamedItem() final { return this; } 179 179 180 180 std::unique_ptr<ValidationMessage> m_validationMessage; -
trunk/Source/WebCore/html/HTMLFrameElementBase.h
r197563 r197566 36 36 void setLocation(const String&); 37 37 38 ScrollbarMode scrollingMode() const overridefinal { return m_scrolling; }38 ScrollbarMode scrollingMode() const final { return m_scrolling; } 39 39 40 40 int marginWidth() const { return m_marginWidth; } … … 44 44 int height(); 45 45 46 bool canContainRangeEndPoint() const overridefinal { return false; }46 bool canContainRangeEndPoint() const final { return false; } 47 47 48 48 protected: … … 52 52 53 53 void parseAttribute(const QualifiedName&, const AtomicString&) override; 54 InsertionNotificationRequest insertedInto(ContainerNode&) overridefinal;55 void finishedInsertingSubtree() overridefinal;54 InsertionNotificationRequest insertedInto(ContainerNode&) final; 55 void finishedInsertingSubtree() final; 56 56 void didAttachRenderers() override; 57 57 58 58 private: 59 bool supportsFocus() const overridefinal;60 void setFocus(bool) overridefinal;59 bool supportsFocus() const final; 60 void setFocus(bool) final; 61 61 62 bool isURLAttribute(const Attribute&) const overridefinal;63 bool isHTMLContentAttribute(const Attribute&) const overridefinal;62 bool isURLAttribute(const Attribute&) const final; 63 bool isHTMLContentAttribute(const Attribute&) const final; 64 64 65 bool isFrameElementBase() const overridefinal { return true; }65 bool isFrameElementBase() const final { return true; } 66 66 67 67 void setNameAndOpenURL(); -
trunk/Source/WebCore/html/HTMLFrameOwnerElement.h
r197563 r197566 65 65 private: 66 66 bool isKeyboardFocusable(KeyboardEvent*) const override; 67 bool isFrameOwnerElement() const overridefinal { return true; }67 bool isFrameOwnerElement() const final { return true; } 68 68 69 69 Frame* m_contentFrame; -
trunk/Source/WebCore/html/HTMLImageElement.h
r197563 r197566 122 122 void removedFrom(ContainerNode&) override; 123 123 124 bool isFormAssociatedElement() const overridefinal { return false; }125 FormNamedItem* asFormNamedItem() overridefinal { return this; }126 HTMLImageElement& asHTMLElement() overridefinal { return *this; }127 const HTMLImageElement& asHTMLElement() const overridefinal { return *this; }124 bool isFormAssociatedElement() const final { return false; } 125 FormNamedItem* asFormNamedItem() final { return this; } 126 HTMLImageElement& asHTMLElement() final { return *this; } 127 const HTMLImageElement& asHTMLElement() const final { return *this; } 128 128 129 129 void selectImageSource(); -
trunk/Source/WebCore/html/HTMLInputElement.h
r197563 r197566 67 67 virtual ~HTMLInputElement(); 68 68 69 WEBCORE_EXPORT bool shouldAutocomplete() const overridefinal;69 WEBCORE_EXPORT bool shouldAutocomplete() const final; 70 70 71 71 // For ValidityState 72 bool hasBadInput() const overridefinal;73 bool patternMismatch() const overridefinal;74 bool rangeUnderflow() const overridefinal;75 bool rangeOverflow() const overridefinal;76 bool stepMismatch() const overridefinal;77 bool tooLong() const overridefinal;78 bool typeMismatch() const overridefinal;79 bool valueMissing() const overridefinal;80 String validationMessage() const overridefinal;72 bool hasBadInput() const final; 73 bool patternMismatch() const final; 74 bool rangeUnderflow() const final; 75 bool rangeOverflow() const final; 76 bool stepMismatch() const final; 77 bool tooLong() const final; 78 bool typeMismatch() const final; 79 bool valueMissing() const final; 80 String validationMessage() const final; 81 81 82 82 // Returns the minimum value for type=date, number, or range. Don't call this for other types. … … 142 142 HTMLElement* containerElement() const; 143 143 144 TextControlInnerTextElement* innerTextElement() const overridefinal;144 TextControlInnerTextElement* innerTextElement() const final; 145 145 Ref<RenderStyle> createInnerTextStyle(const RenderStyle&) const override; 146 146 … … 152 152 HTMLElement* sliderThumbElement() const; 153 153 HTMLElement* sliderTrackElement() const; 154 HTMLElement* placeholderElement() const overridefinal;154 HTMLElement* placeholderElement() const final; 155 155 WEBCORE_EXPORT HTMLElement* autoFillButtonElement() const; 156 156 … … 163 163 // shouldAppearChecked is used by the rendering tree/CSS while checked() is used by JS to determine checked state 164 164 bool shouldAppearChecked() const; 165 bool shouldAppearIndeterminate() const overridefinal;165 bool shouldAppearIndeterminate() const final; 166 166 167 167 unsigned size() const; … … 171 171 void setType(const AtomicString&); 172 172 173 WEBCORE_EXPORT String value() const overridefinal;173 WEBCORE_EXPORT String value() const final; 174 174 void setValue(const String&, ExceptionCode&, TextFieldEventBehavior = DispatchNoEvent); 175 175 WEBCORE_EXPORT void setValue(const String&, TextFieldEventBehavior = DispatchNoEvent); … … 201 201 bool canHaveSelection() const; 202 202 203 bool rendererIsNeeded(const RenderStyle&) overridefinal;204 RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) overridefinal;205 void willAttachRenderers() overridefinal;206 void didAttachRenderers() overridefinal;207 void didDetachRenderers() overridefinal;203 bool rendererIsNeeded(const RenderStyle&) final; 204 RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) final; 205 void willAttachRenderers() final; 206 void didAttachRenderers() final; 207 void didDetachRenderers() final; 208 208 209 209 // FIXME: For isActivatedSubmit and setActivatedSubmit, we should use the NVI-idiom here by making 210 210 // it private virtual in all classes and expose a public method in HTMLFormControlElement to call 211 211 // the private virtual method. 212 bool isActivatedSubmit() const overridefinal;213 void setActivatedSubmit(bool flag) overridefinal;212 bool isActivatedSubmit() const final; 213 void setActivatedSubmit(bool flag) final; 214 214 215 215 String altText() const; … … 300 300 void setWidth(unsigned); 301 301 302 void blur() overridefinal;302 void blur() final; 303 303 void defaultBlur(); 304 304 305 const AtomicString& name() const overridefinal;305 const AtomicString& name() const final; 306 306 307 307 void endEditing(); … … 309 309 static Vector<FileChooserFileInfo> filesFromFileInputFormControlState(const FormControlState&); 310 310 311 bool matchesReadWritePseudoClass() const overridefinal;312 void setRangeText(const String& replacement, ExceptionCode&) overridefinal;313 void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&) overridefinal;311 bool matchesReadWritePseudoClass() const final; 312 void setRangeText(const String& replacement, ExceptionCode&) final; 313 void setRangeText(const String& replacement, unsigned start, unsigned end, const String& selectionMode, ExceptionCode&) final; 314 314 315 315 HTMLImageLoader* imageLoader() { return m_imageLoader.get(); } … … 330 330 enum AutoCompleteSetting { Uninitialized, On, Off }; 331 331 332 void didAddUserAgentShadowRoot(ShadowRoot*) overridefinal;333 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }334 335 void willChangeForm() overridefinal;336 void didChangeForm() overridefinal;337 InsertionNotificationRequest insertedInto(ContainerNode&) overridefinal;338 void finishedInsertingSubtree() overridefinal;339 void removedFrom(ContainerNode&) overridefinal;340 void didMoveToNewDocument(Document* oldDocument) overridefinal;341 342 bool hasCustomFocusLogic() const overridefinal;343 bool isKeyboardFocusable(KeyboardEvent*) const overridefinal;344 bool isMouseFocusable() const overridefinal;345 bool isEnumeratable() const overridefinal;346 bool supportLabels() const overridefinal;347 void updateFocusAppearance(SelectionRestorationMode, SelectionRevealMode) overridefinal;348 bool shouldUseInputMethod() overridefinal;349 350 bool isTextFormControl() const overridefinal { return isTextField(); }351 352 bool canTriggerImplicitSubmission() const overridefinal { return isTextField(); }353 354 const AtomicString& formControlType() const overridefinal;355 356 bool shouldSaveAndRestoreFormControlState() const overridefinal;357 FormControlState saveFormControlState() const overridefinal;358 void restoreFormControlState(const FormControlState&) overridefinal;359 360 bool canStartSelection() const overridefinal;361 362 void accessKeyAction(bool sendMouseEvents) overridefinal;363 364 void parseAttribute(const QualifiedName&, const AtomicString&) overridefinal;365 bool isPresentationAttribute(const QualifiedName&) const overridefinal;366 void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) overridefinal;367 void finishParsingChildren() overridefinal;368 void parserDidSetAttributes() overridefinal;369 370 void copyNonAttributePropertiesFromElement(const Element&) overridefinal;371 372 bool appendFormData(FormDataList&, bool) overridefinal;373 374 bool isSuccessfulSubmitButton() const overridefinal;375 376 void reset() overridefinal;377 378 bool isURLAttribute(const Attribute&) const overridefinal;379 bool isInRange() const overridefinal;380 bool isOutOfRange() const overridefinal;381 382 void resumeFromDocumentSuspension() overridefinal;332 void didAddUserAgentShadowRoot(ShadowRoot*) final; 333 bool canHaveUserAgentShadowRoot() const final { return true; } 334 335 void willChangeForm() final; 336 void didChangeForm() final; 337 InsertionNotificationRequest insertedInto(ContainerNode&) final; 338 void finishedInsertingSubtree() final; 339 void removedFrom(ContainerNode&) final; 340 void didMoveToNewDocument(Document* oldDocument) final; 341 342 bool hasCustomFocusLogic() const final; 343 bool isKeyboardFocusable(KeyboardEvent*) const final; 344 bool isMouseFocusable() const final; 345 bool isEnumeratable() const final; 346 bool supportLabels() const final; 347 void updateFocusAppearance(SelectionRestorationMode, SelectionRevealMode) final; 348 bool shouldUseInputMethod() final; 349 350 bool isTextFormControl() const final { return isTextField(); } 351 352 bool canTriggerImplicitSubmission() const final { return isTextField(); } 353 354 const AtomicString& formControlType() const final; 355 356 bool shouldSaveAndRestoreFormControlState() const final; 357 FormControlState saveFormControlState() const final; 358 void restoreFormControlState(const FormControlState&) final; 359 360 bool canStartSelection() const final; 361 362 void accessKeyAction(bool sendMouseEvents) final; 363 364 void parseAttribute(const QualifiedName&, const AtomicString&) final; 365 bool isPresentationAttribute(const QualifiedName&) const final; 366 void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; 367 void finishParsingChildren() final; 368 void parserDidSetAttributes() final; 369 370 void copyNonAttributePropertiesFromElement(const Element&) final; 371 372 bool appendFormData(FormDataList&, bool) final; 373 374 bool isSuccessfulSubmitButton() const final; 375 376 void reset() final; 377 378 bool isURLAttribute(const Attribute&) const final; 379 bool isInRange() const final; 380 bool isOutOfRange() const final; 381 382 void resumeFromDocumentSuspension() final; 383 383 #if ENABLE(INPUT_TYPE_COLOR) 384 void prepareForDocumentSuspension() overridefinal;385 #endif 386 387 void addSubresourceAttributeURLs(ListHashSet<URL>&) const overridefinal;384 void prepareForDocumentSuspension() final; 385 #endif 386 387 void addSubresourceAttributeURLs(ListHashSet<URL>&) const final; 388 388 389 389 bool needsSuspensionCallback(); … … 395 395 bool tooLong(const String&, NeedsToCheckDirtyFlag) const; 396 396 397 bool supportsPlaceholder() const overridefinal;398 void updatePlaceholderText() overridefinal;399 bool isEmptyValue() const overridefinal;400 void handleFocusEvent(Node* oldFocusedNode, FocusDirection) overridefinal;401 void handleBlurEvent() overridefinal;402 403 bool isOptionalFormControl() const overridefinal { return !isRequiredFormControl(); }404 bool isRequiredFormControl() const overridefinal;405 bool computeWillValidate() const overridefinal;406 void requiredAttributeChanged() overridefinal;397 bool supportsPlaceholder() const final; 398 void updatePlaceholderText() final; 399 bool isEmptyValue() const final; 400 void handleFocusEvent(Node* oldFocusedNode, FocusDirection) final; 401 void handleBlurEvent() final; 402 403 bool isOptionalFormControl() const final { return !isRequiredFormControl(); } 404 bool isRequiredFormControl() const final; 405 bool computeWillValidate() const final; 406 void requiredAttributeChanged() final; 407 407 408 408 void initializeInputType(); … … 410 410 void runPostTypeUpdateTasks(); 411 411 412 void subtreeHasChanged() overridefinal;412 void subtreeHasChanged() final; 413 413 414 414 #if ENABLE(DATALIST_ELEMENT) -
trunk/Source/WebCore/html/HTMLKeygenElement.h
r197563 r197566 53 53 bool shouldSaveAndRestoreFormControlState() const override; 54 54 55 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }55 bool canHaveUserAgentShadowRoot() const final { return true; } 56 56 57 57 HTMLSelectElement* shadowSelect() const; -
trunk/Source/WebCore/html/HTMLMarqueeElement.h
r197563 r197566 63 63 const char* activeDOMObjectName() const override { return "HTMLMarqueeElement"; } 64 64 65 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }65 bool canHaveUserAgentShadowRoot() const final { return true; } 66 66 67 67 RenderMarquee* renderMarquee() const; -
trunk/Source/WebCore/html/HTMLMediaElement.h
r197563 r197566 472 472 virtual void setDisplayMode(DisplayMode mode) { m_displayMode = mode; } 473 473 474 bool isMediaElement() const overridefinal { return true; }474 bool isMediaElement() const final { return true; } 475 475 476 476 #if ENABLE(VIDEO_TRACK) … … 495 495 496 496 // FIXME: Shadow DOM spec says we should be able to create shadow root on audio and video elements 497 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }497 bool canHaveUserAgentShadowRoot() const final { return true; } 498 498 499 499 bool hasCustomFocusLogic() const override; … … 611 611 #endif 612 612 613 bool mediaPlayerIsInMediaDocument() const overridefinal;614 void mediaPlayerEngineFailedToLoad() const overridefinal;615 616 double mediaPlayerRequestedPlaybackRate() const overridefinal;617 VideoFullscreenMode mediaPlayerFullscreenMode() const overridefinal { return fullscreenMode(); }613 bool mediaPlayerIsInMediaDocument() const final; 614 void mediaPlayerEngineFailedToLoad() const final; 615 616 double mediaPlayerRequestedPlaybackRate() const final; 617 VideoFullscreenMode mediaPlayerFullscreenMode() const final { return fullscreenMode(); } 618 618 619 619 #if USE(GSTREAMER) 620 void requestInstallMissingPlugins(const String& details, const String& description, MediaPlayerRequestInstallMissingPluginsCallback&) overridefinal;620 void requestInstallMissingPlugins(const String& details, const String& description, MediaPlayerRequestInstallMissingPluginsCallback&) final; 621 621 #endif 622 622 … … 753 753 754 754 #if ENABLE(WIRELESS_PLAYBACK_TARGET) 755 void prepareForDocumentSuspension() overridefinal;756 void resumeFromDocumentSuspension() overridefinal;755 void prepareForDocumentSuspension() final; 756 void resumeFromDocumentSuspension() final; 757 757 758 758 enum class UpdateMediaState { … … 764 764 #endif 765 765 766 void isVisibleInViewportChanged() overridefinal;766 void isVisibleInViewportChanged() final; 767 767 void updateShouldAutoplay(); 768 768 -
trunk/Source/WebCore/html/HTMLMeterElement.h
r197563 r197566 77 77 void didElementStateChange(); 78 78 void didAddUserAgentShadowRoot(ShadowRoot*) override; 79 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }79 bool canHaveUserAgentShadowRoot() const final { return true; } 80 80 81 81 RefPtr<MeterValueElement> m_value; -
trunk/Source/WebCore/html/HTMLObjectElement.h
r197563 r197566 64 64 65 65 InsertionNotificationRequest insertedInto(ContainerNode&) override; 66 void finishedInsertingSubtree() overridefinal;66 void finishedInsertingSubtree() final; 67 67 void removedFrom(ContainerNode&) override; 68 68 -
trunk/Source/WebCore/html/HTMLPlugInElement.h
r197563 r197566 119 119 120 120 // FIXME: Shadow DOM spec says we should be able to create shadow root on applet, embed, and object. 121 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }121 bool canHaveUserAgentShadowRoot() const final { return true; } 122 122 123 123 // This will load the plugin if necessary. … … 127 127 128 128 bool isKeyboardFocusable(KeyboardEvent*) const override; 129 bool isPluginElement() const overridefinal;129 bool isPluginElement() const final; 130 130 131 131 RefPtr<JSC::Bindings::Instance> m_instance; -
trunk/Source/WebCore/html/HTMLPlugInImageElement.h
r197563 r197566 95 95 96 96 void didMoveToNewDocument(Document* oldDocument) override; 97 bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) overridefinal;97 bool requestObject(const String& url, const String& mimeType, const Vector<String>& paramNames, const Vector<String>& paramValues) final; 98 98 99 99 bool isImageType(); … … 109 109 110 110 private: 111 bool isPlugInImageElement() const overridefinal { return true; }112 bool isRestartedPlugin() const overridefinal { return m_isRestartedPlugin; }111 bool isPlugInImageElement() const final { return true; } 112 bool isRestartedPlugin() const final { return m_isRestartedPlugin; } 113 113 114 void finishParsingChildren() overridefinal;115 void didAddUserAgentShadowRoot(ShadowRoot*) overridefinal;114 void finishParsingChildren() final; 115 void didAddUserAgentShadowRoot(ShadowRoot*) final; 116 116 117 117 RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) override; 118 118 bool childShouldCreateRenderer(const Node&) const override; 119 bool willRecalcStyle(Style::Change) overridefinal;120 void didAttachRenderers() overridefinal;121 void willDetachRenderers() overridefinal;119 bool willRecalcStyle(Style::Change) final; 120 void didAttachRenderers() final; 121 void willDetachRenderers() final; 122 122 123 void prepareForDocumentSuspension() overridefinal;124 void resumeFromDocumentSuspension() overridefinal;123 void prepareForDocumentSuspension() final; 124 void resumeFromDocumentSuspension() final; 125 125 126 void defaultEventHandler(Event*) overridefinal;127 void dispatchPendingMouseClick() overridefinal;126 void defaultEventHandler(Event*) final; 127 void dispatchPendingMouseClick() final; 128 128 129 void updateSnapshot(PassRefPtr<Image>) overridefinal;129 void updateSnapshot(PassRefPtr<Image>) final; 130 130 131 131 void startLoadingImage(); -
trunk/Source/WebCore/html/HTMLProgressElement.h
r197563 r197566 63 63 void didElementStateChange(); 64 64 void didAddUserAgentShadowRoot(ShadowRoot*) override; 65 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }65 bool canHaveUserAgentShadowRoot() const final { return true; } 66 66 bool isDeterminate() const; 67 67 -
trunk/Source/WebCore/html/HTMLSelectElement.h
r197563 r197566 124 124 bool isMouseFocusable() const override; 125 125 126 void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) overridefinal;127 void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) overridefinal;126 void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) final; 127 void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) final; 128 128 129 129 bool canStartSelection() const override { return false; } 130 130 131 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }131 bool canHaveUserAgentShadowRoot() const final { return true; } 132 132 133 133 bool isEnumeratable() const override { return true; } … … 150 150 void dispatchChangeEventForMenuList(); 151 151 152 void didRecalcStyle(Style::Change) overridefinal;152 void didRecalcStyle(Style::Change) final; 153 153 154 154 void recalcListItems(bool updateSelectedStates = true) const; -
trunk/Source/WebCore/html/HTMLSummaryElement.h
r197563 r197566 44 44 45 45 // FIXME: Shadow DOM spec says we should be able to create shadow root on this element 46 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }46 bool canHaveUserAgentShadowRoot() const final { return true; } 47 47 48 48 HTMLDetailsElement* detailsElement() const; -
trunk/Source/WebCore/html/HTMLTextAreaElement.h
r197563 r197566 70 70 71 71 void didAddUserAgentShadowRoot(ShadowRoot*) override; 72 bool canHaveUserAgentShadowRoot() const overridefinal { return true; }72 bool canHaveUserAgentShadowRoot() const final { return true; } 73 73 74 74 void maxLengthAttributeChanged(const AtomicString& newValue); -
trunk/Source/WebCore/html/HTMLTextFormControlElement.h
r197563 r197566 76 76 String selectedText() const; 77 77 78 void dispatchFormControlChangeEvent() overridefinal;78 void dispatchFormControlChangeEvent() final; 79 79 80 80 virtual String value() const = 0; … … 132 132 TextFieldSelectionDirection computeSelectionDirection() const; 133 133 134 void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) overridefinal;135 void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) overridefinal;134 void dispatchFocusEvent(RefPtr<Element>&& oldFocusedElement, FocusDirection) final; 135 void dispatchBlurEvent(RefPtr<Element>&& newFocusedElement) final; 136 136 bool childShouldCreateRenderer(const Node&) const override; 137 137 -
trunk/Source/WebCore/html/HTMLUnknownElement.h
r197563 r197566 49 49 50 50 #if ENABLE(METER_ELEMENT) 51 bool canHaveUserAgentShadowRoot() const overridefinal { return false; }51 bool canHaveUserAgentShadowRoot() const final { return false; } 52 52 #else 53 bool canHaveUserAgentShadowRoot() const overridefinal { return localName() == "meter"; }53 bool canHaveUserAgentShadowRoot() const final { return localName() == "meter"; } 54 54 #endif 55 55 -
trunk/Source/WebCore/html/LabelableElement.h
r197563 r197566 48 48 49 49 private: 50 bool isLabelable() const overridefinal { return true; }50 bool isLabelable() const final { return true; } 51 51 }; 52 52 -
trunk/Source/WebCore/html/TextFieldInputType.h
r197563 r197566 50 50 void handleKeydownEventForSpinButton(KeyboardEvent*); 51 51 52 HTMLElement* containerElement() const overridefinal;53 HTMLElement* innerBlockElement() const overridefinal;54 TextControlInnerTextElement* innerTextElement() const overridefinal;55 HTMLElement* innerSpinButtonElement() const overridefinal;56 HTMLElement* capsLockIndicatorElement() const overridefinal;57 HTMLElement* autoFillButtonElement() const overridefinal;52 HTMLElement* containerElement() const final; 53 HTMLElement* innerBlockElement() const final; 54 TextControlInnerTextElement* innerTextElement() const final; 55 HTMLElement* innerSpinButtonElement() const final; 56 HTMLElement* capsLockIndicatorElement() const final; 57 HTMLElement* autoFillButtonElement() const final; 58 58 59 59 protected: … … 61 61 void createShadowSubtree() override; 62 62 void destroyShadowSubtree() override; 63 void attributeChanged() overridefinal;64 void disabledAttributeChanged() overridefinal;65 void readonlyAttributeChanged() overridefinal;66 bool supportsReadOnly() const overridefinal;67 void handleFocusEvent(Node* oldFocusedNode, FocusDirection) overridefinal;68 void handleBlurEvent() overridefinal;63 void attributeChanged() final; 64 void disabledAttributeChanged() final; 65 void readonlyAttributeChanged() final; 66 bool supportsReadOnly() const final; 67 void handleFocusEvent(Node* oldFocusedNode, FocusDirection) final; 68 void handleBlurEvent() final; 69 69 void setValue(const String&, bool valueChanged, TextFieldEventBehavior) override; 70 void updateInnerTextValue() overridefinal;70 void updateInnerTextValue() final; 71 71 String sanitizeValue(const String&) const override; 72 72 … … 75 75 76 76 private: 77 bool isKeyboardFocusable(KeyboardEvent*) const overridefinal;78 bool isMouseFocusable() const overridefinal;79 bool isTextField() const overridefinal;80 bool isEmptyValue() const overridefinal;81 bool valueMissing(const String&) const overridefinal;82 void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*) overridefinal;83 void forwardEvent(Event*) overridefinal;84 bool shouldSubmitImplicitly(Event*) overridefinal;77 bool isKeyboardFocusable(KeyboardEvent*) const final; 78 bool isMouseFocusable() const final; 79 bool isTextField() const final; 80 bool isEmptyValue() const final; 81 bool valueMissing(const String&) const final; 82 void handleBeforeTextInsertedEvent(BeforeTextInsertedEvent*) final; 83 void forwardEvent(Event*) final; 84 bool shouldSubmitImplicitly(Event*) final; 85 85 RenderPtr<RenderElement> createInputRenderer(Ref<RenderStyle>&&) override; 86 86 bool shouldUseInputMethod() const override; 87 87 bool shouldRespectListAttribute() override; 88 HTMLElement* placeholderElement() const overridefinal;89 void updatePlaceholderText() overridefinal;90 bool appendFormData(FormDataList&, bool multipart) const overridefinal;91 void subtreeHasChanged() overridefinal;92 void capsLockStateMayHaveChanged() overridefinal;93 void updateAutoFillButton() overridefinal;88 HTMLElement* placeholderElement() const final; 89 void updatePlaceholderText() final; 90 bool appendFormData(FormDataList&, bool multipart) const final; 91 void subtreeHasChanged() final; 92 void capsLockStateMayHaveChanged() final; 93 void updateAutoFillButton() final; 94 94 95 95 // SpinButtonElement::SpinButtonOwner functions. 96 void focusAndSelectSpinButtonOwner() overridefinal;97 bool shouldSpinButtonRespondToMouseEvents() overridefinal;98 bool shouldSpinButtonRespondToWheelEvents() overridefinal;99 void spinButtonStepDown() overridefinal;100 void spinButtonStepUp() overridefinal;96 void focusAndSelectSpinButtonOwner() final; 97 bool shouldSpinButtonRespondToMouseEvents() final; 98 bool shouldSpinButtonRespondToWheelEvents() final; 99 void spinButtonStepDown() final; 100 void spinButtonStepUp() final; 101 101 102 102 // AutoFillButtonElement::AutoFillButtonOwner 103 void autoFillButtonElementWasClicked() overridefinal;103 void autoFillButtonElementWasClicked() final; 104 104 105 105 bool shouldHaveSpinButton() const; -
trunk/Source/WebCore/html/parser/HTMLDocumentParser.h
r197563 r197566 61 61 // For HTMLTreeBuilder. 62 62 HTMLTokenizer& tokenizer(); 63 TextPosition textPosition() const overridefinal;63 TextPosition textPosition() const final; 64 64 65 65 protected: 66 66 explicit HTMLDocumentParser(HTMLDocument&); 67 67 68 void insert(const SegmentedString&) overridefinal;68 void insert(const SegmentedString&) final; 69 69 void append(RefPtr<StringImpl>&&) override; 70 70 void finish() override; … … 77 77 78 78 // DocumentParser 79 void detach() overridefinal;80 bool hasInsertionPoint() overridefinal;81 bool processingData() const overridefinal;82 void prepareToStopParsing() overridefinal;83 void stopParsing() overridefinal;79 void detach() final; 80 bool hasInsertionPoint() final; 81 bool processingData() const final; 82 void prepareToStopParsing() final; 83 void stopParsing() final; 84 84 bool isWaitingForScripts() const override; 85 bool isExecutingScript() const overridefinal;86 void executeScriptsWaitingForStylesheets() overridefinal;87 void suspendScheduledTasks() overridefinal;88 void resumeScheduledTasks() overridefinal;85 bool isExecutingScript() const final; 86 void executeScriptsWaitingForStylesheets() final; 87 void suspendScheduledTasks() final; 88 void resumeScheduledTasks() final; 89 89 90 bool shouldAssociateConsoleMessagesWithTextPosition() const overridefinal;90 bool shouldAssociateConsoleMessagesWithTextPosition() const final; 91 91 92 92 // HTMLScriptRunnerHost 93 void watchForLoad(CachedResource*) overridefinal;94 void stopWatchingForLoad(CachedResource*) overridefinal;95 HTMLInputStream& inputStream() overridefinal;96 bool hasPreloadScanner() const overridefinal;97 void appendCurrentInputStreamToPreloadScannerAndScan() overridefinal;93 void watchForLoad(CachedResource*) final; 94 void stopWatchingForLoad(CachedResource*) final; 95 HTMLInputStream& inputStream() final; 96 bool hasPreloadScanner() const final; 97 void appendCurrentInputStreamToPreloadScannerAndScan() final; 98 98 99 99 // CachedResourceClient 100 void notifyFinished(CachedResource*) overridefinal;100 void notifyFinished(CachedResource*) final; 101 101 102 102 Document* contextForParsingSession(); -
trunk/Source/WebCore/html/shadow/ImageControlsRootElement.h
r197563 r197566 45 45 46 46 private: 47 bool isImageControlsRootElement() const overridefinal { return true; }47 bool isImageControlsRootElement() const final { return true; } 48 48 }; 49 49 -
trunk/Source/WebCore/html/shadow/MediaControlElementTypes.h
r197563 r197566 113 113 114 114 private: 115 bool isMediaControlElement() const overridefinal { return MediaControlElement::isMediaControlElement(); }115 bool isMediaControlElement() const final { return MediaControlElement::isMediaControlElement(); } 116 116 }; 117 117 … … 123 123 124 124 private: 125 bool isMediaControlElement() const overridefinal { return MediaControlElement::isMediaControlElement(); }125 bool isMediaControlElement() const final { return MediaControlElement::isMediaControlElement(); } 126 126 virtual void updateDisplayType() { } 127 127 }; … … 171 171 172 172 private: 173 void setActive(bool /*flag*/ = true, bool /*pause*/ = false) overridefinal;173 void setActive(bool /*flag*/ = true, bool /*pause*/ = false) final; 174 174 }; 175 175 -
trunk/Source/WebCore/html/shadow/MediaControls.h
r197563 r197566 143 143 144 144 private: 145 bool isMediaControls() const overridefinal { return true; }145 bool isMediaControls() const final { return true; } 146 146 }; 147 147 -
trunk/Source/WebCore/html/track/InbandTextTrack.h
r197563 r197566 63 63 64 64 private: 65 bool isInband() const overridefinal { return true; }65 bool isInband() const final { return true; } 66 66 void idChanged(TrackPrivateBase*, const AtomicString&) override; 67 67 void labelChanged(TrackPrivateBase*, const AtomicString&) override; -
trunk/Source/WebCore/html/track/TextTrack.h
r197563 r197566 64 64 virtual ~TextTrack(); 65 65 66 EventTargetInterface eventTargetInterface() const overridefinal { return TextTrackEventTargetInterfaceType; }67 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return m_scriptExecutionContext; }66 EventTargetInterface eventTargetInterface() const final { return TextTrackEventTargetInterfaceType; } 67 ScriptExecutionContext* scriptExecutionContext() const final { return m_scriptExecutionContext; } 68 68 69 69 static TextTrack* captionMenuOffItem(); … … 156 156 bool enabled() const override; 157 157 158 void refEventTarget() overridefinal { ref(); }159 void derefEventTarget() overridefinal { deref(); }158 void refEventTarget() final { ref(); } 159 void derefEventTarget() final { deref(); } 160 160 161 161 VTTRegionList* ensureVTTRegionList(); -
trunk/Source/WebCore/html/track/TextTrackCue.h
r197563 r197566 86 86 virtual void setIsActive(bool); 87 87 88 EventTargetInterface eventTargetInterface() const overridefinal { return TextTrackCueEventTargetInterfaceType; }89 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return &m_scriptExecutionContext; }88 EventTargetInterface eventTargetInterface() const final { return TextTrackCueEventTargetInterfaceType; } 89 ScriptExecutionContext* scriptExecutionContext() const final { return &m_scriptExecutionContext; } 90 90 91 91 virtual bool isOrderedBefore(const TextTrackCue*) const; … … 123 123 private: 124 124 125 void refEventTarget() overridefinal { ref(); }126 void derefEventTarget() overridefinal { deref(); }125 void refEventTarget() final { ref(); } 126 void derefEventTarget() final { deref(); } 127 127 128 128 String m_id; -
trunk/Source/WebCore/html/track/TrackListBase.h
r197563 r197566 55 55 using RefCounted<TrackListBase>::ref; 56 56 using RefCounted<TrackListBase>::deref; 57 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return m_context; }57 ScriptExecutionContext* scriptExecutionContext() const final { return m_context; } 58 58 59 59 void clearElement() { m_element = 0; } … … 78 78 79 79 // EventTarget 80 void refEventTarget() overridefinal { ref(); }81 void derefEventTarget() overridefinal { deref(); }80 void refEventTarget() final { ref(); } 81 void derefEventTarget() final { deref(); } 82 82 83 83 ScriptExecutionContext* m_context; -
trunk/Source/WebCore/html/track/VTTCue.h
r197563 r197566 65 65 VTTCueBox(Document&, VTTCue&); 66 66 67 RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) overridefinal;67 RenderPtr<RenderElement> createElementRenderer(Ref<RenderStyle>&&, const RenderTreePosition&) final; 68 68 69 69 VTTCue& m_cue; … … 167 167 168 168 CueType cueType() const override { return WebVTT; } 169 bool isRenderable() const overridefinal { return true; }169 bool isRenderable() const final { return true; } 170 170 171 171 void didChange() override; -
trunk/Source/WebCore/inspector/InspectorFrontendClientLocal.h
r197563 r197566 60 60 WEBCORE_EXPORT virtual ~InspectorFrontendClientLocal(); 61 61 62 WEBCORE_EXPORT void windowObjectCleared() overridefinal;62 WEBCORE_EXPORT void windowObjectCleared() final; 63 63 WEBCORE_EXPORT void frontendLoaded() override; 64 64 65 65 void startWindowDrag() override { } 66 WEBCORE_EXPORT void moveWindowBy(float x, float y) overridefinal;66 WEBCORE_EXPORT void moveWindowBy(float x, float y) final; 67 67 68 WEBCORE_EXPORT void requestSetDockSide(DockSide) overridefinal;69 WEBCORE_EXPORT void changeAttachedWindowHeight(unsigned) overridefinal;70 WEBCORE_EXPORT void changeAttachedWindowWidth(unsigned) overridefinal;71 WEBCORE_EXPORT void openInNewTab(const String& url) overridefinal;68 WEBCORE_EXPORT void requestSetDockSide(DockSide) final; 69 WEBCORE_EXPORT void changeAttachedWindowHeight(unsigned) final; 70 WEBCORE_EXPORT void changeAttachedWindowWidth(unsigned) final; 71 WEBCORE_EXPORT void openInNewTab(const String& url) final; 72 72 bool canSave() override { return false; } 73 73 void save(const String&, const String&, bool, bool) override { } … … 77 77 virtual void detachWindow() = 0; 78 78 79 WEBCORE_EXPORT void sendMessageToBackend(const String& message) overridefinal;79 WEBCORE_EXPORT void sendMessageToBackend(const String& message) final; 80 80 81 WEBCORE_EXPORT bool isUnderTest() overridefinal;82 WEBCORE_EXPORT unsigned inspectionLevel() const overridefinal;81 WEBCORE_EXPORT bool isUnderTest() final; 82 WEBCORE_EXPORT unsigned inspectionLevel() const final; 83 83 84 84 WEBCORE_EXPORT bool canAttachWindow(); -
trunk/Source/WebCore/inspector/WebConsoleAgent.h
r197563 r197566 43 43 virtual ~WebConsoleAgent() { } 44 44 45 void setMonitoringXHREnabled(ErrorString&, bool enabled) overridefinal;45 void setMonitoringXHREnabled(ErrorString&, bool enabled) final; 46 46 47 47 void frameWindowDiscarded(DOMWindow*); -
trunk/Source/WebCore/loader/DocumentThreadableLoader.h
r197563 r197566 97 97 bool isAllowedByContentSecurityPolicy(const URL&); 98 98 99 bool isXMLHttpRequest() const overridefinal;99 bool isXMLHttpRequest() const final; 100 100 101 101 SecurityOrigin* securityOrigin() const; -
trunk/Source/WebCore/page/DebugPageOverlays.cpp
r197563 r197566 55 55 56 56 private: 57 v irtual void pageOverlayDestroyed(PageOverlay&) final;58 v irtual void willMoveToPage(PageOverlay&, Page*) final;59 v irtual void didMoveToPage(PageOverlay&, Page*) final;60 v irtual void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) final;61 virtualbool mouseEvent(PageOverlay&, const PlatformMouseEvent&) final;62 v irtual void didScrollFrame(PageOverlay&, Frame&) final;57 void pageOverlayDestroyed(PageOverlay&) final; 58 void willMoveToPage(PageOverlay&, Page*) final; 59 void didMoveToPage(PageOverlay&, Page*) final; 60 void drawRect(PageOverlay&, GraphicsContext&, const IntRect& dirtyRect) final; 61 bool mouseEvent(PageOverlay&, const PlatformMouseEvent&) final; 62 void didScrollFrame(PageOverlay&, Frame&) final; 63 63 64 64 protected: -
trunk/Source/WebCore/page/SuspendableTimer.h
r197563 r197566 59 59 60 60 // ActiveDOMObject API. 61 bool hasPendingActivity() const overridefinal;62 void stop() overridefinal;63 bool canSuspendForDocumentSuspension() const overridefinal;64 void suspend(ReasonForSuspension) overridefinal;65 void resume() overridefinal;61 bool hasPendingActivity() const final; 62 void stop() final; 63 bool canSuspendForDocumentSuspension() const final; 64 void suspend(ReasonForSuspension) final; 65 void resume() final; 66 66 67 67 bool m_suspended; -
trunk/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h
r197563 r197566 130 130 InbandTextTrackPrivateAVF* currentTextTrack() const override; 131 131 132 long assetErrorCode() const overridefinal;132 long assetErrorCode() const final; 133 133 134 134 #if !HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT) -
trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerOwr.h
r197023 r197566 85 85 86 86 // MediaStreamTrackPrivate::Observer implementation. 87 void trackEnded(MediaStreamTrackPrivate&) overridefinal;88 void trackMutedChanged(MediaStreamTrackPrivate&) overridefinal;89 void trackSettingsChanged(MediaStreamTrackPrivate&) overridefinal;90 void trackEnabledChanged(MediaStreamTrackPrivate&) overridefinal;87 void trackEnded(MediaStreamTrackPrivate&) final; 88 void trackMutedChanged(MediaStreamTrackPrivate&) final; 89 void trackSettingsChanged(MediaStreamTrackPrivate&) final; 90 void trackEnabledChanged(MediaStreamTrackPrivate&) final; 91 91 92 92 static void getSupportedTypes(HashSet<String, ASCIICaseInsensitiveHash>&); -
trunk/Source/WebCore/platform/graphics/texmap/TextureMapperPlatformLayerBuffer.h
r194496 r197566 43 43 virtual ~TextureMapperPlatformLayerBuffer() = default; 44 44 45 v irtual void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0) final;45 void paintToTextureMapper(TextureMapper&, const FloatRect&, const TransformationMatrix& modelViewMatrix = TransformationMatrix(), float opacity = 1.0) final; 46 46 47 47 bool canReuseWithoutReset(const IntSize&, GC3Dint internalFormat); -
trunk/Source/WebCore/platform/mac/HIDGamepad.h
r197563 r197566 101 101 void valueChanged(IOHIDValueRef); 102 102 103 const Vector<double>& axisValues() const overridefinal { return m_axisValues; }104 const Vector<double>& buttonValues() const overridefinal { return m_buttonValues; }103 const Vector<double>& axisValues() const final { return m_axisValues; } 104 const Vector<double>& buttonValues() const final { return m_buttonValues; } 105 105 106 106 private: -
trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.h
r197563 r197566 64 64 void setVisibleScrollerThumbRect(const IntRect&); 65 65 66 bool scrollbarsCanBeActive() const overridefinal;66 bool scrollbarsCanBeActive() const final; 67 67 68 68 private: … … 111 111 void mayBeginScrollGesture() const; 112 112 113 void lockOverlayScrollbarStateToHidden(bool shouldLockState) overridefinal;113 void lockOverlayScrollbarStateToHidden(bool shouldLockState) final; 114 114 115 115 void didAddVerticalScrollbar(Scrollbar*) override; -
trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h
r194371 r197566 101 101 102 102 // RealtimeMediaSourceObserver 103 void sourceStopped() overridefinal;104 void sourceMutedChanged() overridefinal;105 void sourceSettingsChanged() overridefinal;106 bool preventSourceFromStopping() overridefinal;103 void sourceStopped() final; 104 void sourceMutedChanged() final; 105 void sourceSettingsChanged() final; 106 bool preventSourceFromStopping() final; 107 107 108 108 Vector<Observer*> m_observers; -
trunk/Source/WebCore/platform/text/LocaleNone.cpp
r197563 r197566 35 35 36 36 private: 37 void initializeLocaleData() overridefinal;37 void initializeLocaleData() final; 38 38 #if ENABLE(DATE_AND_TIME_INPUT_TYPES) 39 39 String dateFormat() override; -
trunk/Source/WebCore/platform/text/PlatformLocale.cpp
r197563 r197566 52 52 private: 53 53 // DateTimeFormat::TokenHandler functions. 54 void visitField(DateTimeFormat::FieldType, int) overridefinal;55 void visitLiteral(const String&) overridefinal;54 void visitField(DateTimeFormat::FieldType, int) final; 55 void visitLiteral(const String&) final; 56 56 57 57 String zeroPadString(const String&, size_t width); -
trunk/Source/WebCore/rendering/EllipsisBox.h
r197563 r197566 33 33 EllipsisBox(RenderBlockFlow&, const AtomicString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isVertical, InlineBox* markupBox); 34 34 void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; 35 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) overridefinal;35 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) final; 36 36 void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; } 37 37 IntRect selectionRect(); -
trunk/Source/WebCore/rendering/FloatingObjects.cpp
r197563 r197566 163 163 164 164 protected: 165 bool updateOffsetIfNeeded(const FloatingObject&) overridefinal;165 bool updateOffsetIfNeeded(const FloatingObject&) final; 166 166 }; 167 167 … … 177 177 178 178 protected: 179 bool updateOffsetIfNeeded(const FloatingObject&) overridefinal;179 bool updateOffsetIfNeeded(const FloatingObject&) final; 180 180 }; 181 181 -
trunk/Source/WebCore/rendering/InlineElementBox.h
r197563 r197566 45 45 RenderBoxModelObject& renderer() const { return downcast<RenderBoxModelObject>(InlineBox::renderer()); } 46 46 47 void deleteLine() overridefinal;48 void extractLine() overridefinal;49 void attachLine() overridefinal;47 void deleteLine() final; 48 void extractLine() final; 49 void attachLine() final; 50 50 51 51 void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; … … 53 53 54 54 private: 55 bool isInlineElementBox() const overridefinal { return true; }55 bool isInlineElementBox() const final { return true; } 56 56 }; 57 57 -
trunk/Source/WebCore/rendering/InlineFlowBox.h
r197563 r197566 88 88 InlineBox* lastChild() const { checkConsistency(); return m_lastChild; } 89 89 90 bool isLeaf() const overridefinal { return false; }90 bool isLeaf() const final { return false; } 91 91 92 92 InlineBox* firstLeafChild() const; … … 96 96 void collectLeafBoxesInLogicalOrder(Vector<InlineBox*>&, CustomInlineBoxRangeReverse customReverseImplementation = nullptr, void* userData = nullptr) const; 97 97 98 void setConstructed() overridefinal98 void setConstructed() final 99 99 { 100 100 InlineBox::setConstructed(); … … 104 104 105 105 void addToLine(InlineBox* child); 106 void deleteLine() overridefinal;107 void extractLine() overridefinal;108 void attachLine() overridefinal;106 void deleteLine() final; 107 void extractLine() final; 108 void attachLine() final; 109 109 void adjustPosition(float dx, float dy) override; 110 110 … … 205 205 RenderObject::SelectionState selectionState() override; 206 206 207 bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const overridefinal;207 bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const final; 208 208 float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool&) override; 209 209 … … 304 304 305 305 private: 306 bool isInlineFlowBox() const overridefinal { return true; }306 bool isInlineFlowBox() const final { return true; } 307 307 void boxModelObject() const = delete; 308 308 -
trunk/Source/WebCore/rendering/InlineTextBox.h
r197563 r197566 74 74 unsigned short truncation() const { return m_truncation; } 75 75 76 void markDirty(bool dirty = true) overridefinal;76 void markDirty(bool dirty = true) final; 77 77 78 78 using InlineBox::hasHyphen; … … 89 89 static inline bool compareByStart(const InlineTextBox* first, const InlineTextBox* second) { return first->start() < second->start(); } 90 90 91 int baselinePosition(FontBaseline) const overridefinal;92 LayoutUnit lineHeight() const overridefinal;91 int baselinePosition(FontBaseline) const final; 92 LayoutUnit lineHeight() const final; 93 93 94 94 bool emphasisMarkExistsAndIsAbove(const RenderStyle&, bool& isAbove) const; … … 104 104 105 105 #if ENABLE(TREE_DEBUGGING) 106 void showLineBox(bool mark, int depth) const overridefinal;107 const char* boxName() const overridefinal;106 void showLineBox(bool mark, int depth) const final; 107 const char* boxName() const final; 108 108 #endif 109 109 … … 128 128 129 129 private: 130 void deleteLine() overridefinal;131 void extractLine() overridefinal;132 void attachLine() overridefinal;130 void deleteLine() final; 131 void extractLine() final; 132 void attachLine() final; 133 133 134 134 public: 135 RenderObject::SelectionState selectionState() overridefinal;135 RenderObject::SelectionState selectionState() final; 136 136 137 137 private: 138 void clearTruncation() overridefinal { m_truncation = cNoTruncation; }139 float placeEllipsisBox(bool flowIsLTR, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) overridefinal;138 void clearTruncation() final { m_truncation = cNoTruncation; } 139 float placeEllipsisBox(bool flowIsLTR, float visibleLeftEdge, float visibleRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) final; 140 140 141 141 public: 142 bool isLineBreak() const overridefinal;142 bool isLineBreak() const final; 143 143 144 144 private: 145 bool isInlineTextBox() const overridefinal { return true; }145 bool isInlineTextBox() const final { return true; } 146 146 147 147 public: 148 int caretMinOffset() const overridefinal;149 int caretMaxOffset() const overridefinal;148 int caretMinOffset() const final; 149 int caretMaxOffset() const final; 150 150 151 151 private: -
trunk/Source/WebCore/rendering/RenderBlock.h
r197563 r197566 68 68 public: 69 69 // These two functions are overridden for inline-block. 70 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const overridefinal;70 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 71 71 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override; 72 72 … … 187 187 bool paintsContinuationOutline(RenderInline*); 188 188 189 RenderBoxModelObject* virtualContinuation() const overridefinal { return continuation(); }189 RenderBoxModelObject* virtualContinuation() const final { return continuation(); } 190 190 bool isAnonymousBlockContinuation() const { return isAnonymousBlock() && continuation(); } 191 191 WEBCORE_EXPORT RenderInline* inlineElementContinuation() const; … … 404 404 const char* renderName() const override; 405 405 406 bool isInlineBlockOrInlineTable() const overridefinal { return isInline() && isReplaced(); }406 bool isInlineBlockOrInlineTable() const final { return isInline() && isReplaced(); } 407 407 408 408 void makeChildrenNonInline(RenderObject* insertionPoint = nullptr); … … 448 448 void computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const; 449 449 450 LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const overridefinal;451 const RenderStyle& outlineStyleForRepaint() const overridefinal;452 453 RenderElement* hoverAncestor() const overridefinal;454 void updateDragState(bool dragOn) overridefinal;455 void childBecameNonInline(RenderElement&) overridefinal;456 457 LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) overridefinal450 LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const final; 451 const RenderStyle& outlineStyleForRepaint() const final; 452 453 RenderElement* hoverAncestor() const final; 454 void updateDragState(bool dragOn) final; 455 void childBecameNonInline(RenderElement&) final; 456 457 LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool /*clipToVisibleContent*/) final 458 458 { 459 459 return selectionGapRectsForRepaint(repaintContainer); 460 460 } 461 bool shouldPaintSelectionGaps() const overridefinal;461 bool shouldPaintSelectionGaps() const final; 462 462 bool isSelectionRoot() const; 463 463 GapRects selectionGaps(RenderBlock& rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock, … … 480 480 void paintContinuationOutlines(PaintInfo&, const LayoutPoint&); 481 481 482 LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) overridefinal;482 LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) final; 483 483 484 484 // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow -
trunk/Source/WebCore/rendering/RenderBlockFlow.h
r197563 r197566 78 78 79 79 // RenderBlockFlows override these methods, since they are the only class that supports margin collapsing. 80 LayoutUnit collapsedMarginBefore() const overridefinal { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); }81 LayoutUnit collapsedMarginAfter() const overridefinal { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); }82 83 void dirtyLinesFromChangedChild(RenderObject& child) overridefinal { lineBoxes().dirtyLinesFromChangedChild(*this, child); }80 LayoutUnit collapsedMarginBefore() const final { return maxPositiveMarginBefore() - maxNegativeMarginBefore(); } 81 LayoutUnit collapsedMarginAfter() const final { return maxPositiveMarginAfter() - maxNegativeMarginAfter(); } 82 83 void dirtyLinesFromChangedChild(RenderObject& child) final { lineBoxes().dirtyLinesFromChangedChild(*this, child); } 84 84 void updateLogicalHeight() override; 85 85 … … 259 259 void setCollapsedBottomMargin(const MarginInfo&); 260 260 261 bool childrenPreventSelfCollapsing() const overridefinal;261 bool childrenPreventSelfCollapsing() const final; 262 262 263 263 bool shouldBreakAtLineToAvoidWidow() const { return hasRareBlockFlowData() && rareBlockFlowData()->m_lineBreakToAvoidWidow >= 0; } … … 346 346 RootInlineBox* lastRootBox() const { return downcast<RootInlineBox>(m_lineBoxes.lastLineBox()); } 347 347 348 bool hasLines() const overridefinal;349 void invalidateLineLayoutPath() overridefinal;348 bool hasLines() const final; 349 void invalidateLineLayoutPath() final; 350 350 351 351 enum LineLayoutPath { UndeterminedPath = 0, SimpleLinesPath, LineBoxesPath, ForceLineBoxesPath }; … … 485 485 486 486 void moveAllChildrenIncludingFloatsTo(RenderBlock& toBlock, bool fullRemoveInsert) override; 487 void repaintOverhangingFloats(bool paintAllDescendants) overridefinal;487 void repaintOverhangingFloats(bool paintAllDescendants) final; 488 488 void clipOutFloatingObjects(RenderBlock&, const PaintInfo*, const LayoutPoint&, const LayoutSize&) override; 489 489 … … 601 601 unsigned m_lineCountForTextAutosizing : 2; 602 602 #endif 603 void setSelectionState(SelectionState) overridefinal;603 void setSelectionState(SelectionState) final; 604 604 605 605 public: -
trunk/Source/WebCore/rendering/RenderBox.h
r197563 r197566 59 59 } 60 60 61 bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const overridefinal;61 bool backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) const final; 62 62 63 63 // Use this with caution! No type checking is done! … … 154 154 LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); } 155 155 LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); } 156 IntRect borderBoundingBox() const overridefinal { return enclosingIntRect(borderBoxRect()); }156 IntRect borderBoundingBox() const final { return enclosingIntRect(borderBoxRect()); } 157 157 158 158 WEBCORE_EXPORT RoundedRect::Radii borderRadii() const; … … 170 170 171 171 // Bounds of the outline box in absolute coords. Respects transforms 172 LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const overridefinal;172 LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* /*repaintContainer*/, const RenderGeometryMap*) const final; 173 173 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = nullptr) override; 174 174 … … 255 255 LayoutUnit marginLogicalRight() const { return m_marginBox.end(style().writingMode()); } 256 256 257 LayoutUnit marginBefore(const RenderStyle* overrideStyle = nullptr) const overridefinal { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); }258 LayoutUnit marginAfter(const RenderStyle* overrideStyle = nullptr) const overridefinal { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); }259 LayoutUnit marginStart(const RenderStyle* overrideStyle = nullptr) const overridefinal257 LayoutUnit marginBefore(const RenderStyle* overrideStyle = nullptr) const final { return m_marginBox.before((overrideStyle ? overrideStyle : &style())->writingMode()); } 258 LayoutUnit marginAfter(const RenderStyle* overrideStyle = nullptr) const final { return m_marginBox.after((overrideStyle ? overrideStyle : &style())->writingMode()); } 259 LayoutUnit marginStart(const RenderStyle* overrideStyle = nullptr) const final 260 260 { 261 261 const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style(); 262 262 return m_marginBox.start(styleToUse->writingMode(), styleToUse->direction()); 263 263 } 264 LayoutUnit marginEnd(const RenderStyle* overrideStyle = nullptr) const overridefinal264 LayoutUnit marginEnd(const RenderStyle* overrideStyle = nullptr) const final 265 265 { 266 266 const RenderStyle* styleToUse = overrideStyle ? overrideStyle : &style(); … … 723 723 virtual void computePreferredLogicalWidths() { setPreferredLogicalWidthsDirty(false); } 724 724 725 LayoutRect frameRectForStickyPositioning() const overridefinal { return frameRect(); }725 LayoutRect frameRectForStickyPositioning() const final { return frameRect(); } 726 726 727 727 void applyTopLeftLocationOffsetWithFlipping(LayoutPoint&) const; -
trunk/Source/WebCore/rendering/RenderElement.h
r197563 r197566 287 287 void isRenderElement() const = delete; 288 288 289 RenderObject* firstChildSlow() const overridefinal { return firstChild(); }290 RenderObject* lastChildSlow() const overridefinal { return lastChild(); }289 RenderObject* firstChildSlow() const final { return firstChild(); } 290 RenderObject* lastChildSlow() const final { return lastChild(); } 291 291 292 292 // Called when an object that was floating or positioned becomes a normal flow object … … 308 308 RenderStyle* cachedFirstLineStyle() const; 309 309 310 void newImageAnimationFrameAvailable(CachedImage&) final override;310 void newImageAnimationFrameAvailable(CachedImage&) final; 311 311 312 312 bool getLeadingCorner(FloatPoint& output) const; -
trunk/Source/WebCore/rendering/RenderEmbeddedObject.h
r197563 r197566 62 62 63 63 protected: 64 void paintReplaced(PaintInfo&, const LayoutPoint&) overridefinal;64 void paintReplaced(PaintInfo&, const LayoutPoint&) final; 65 65 void paint(PaintInfo&, const LayoutPoint&) override; 66 66 … … 72 72 private: 73 73 const char* renderName() const override { return "RenderEmbeddedObject"; } 74 bool isEmbeddedObject() const overridefinal { return true; }74 bool isEmbeddedObject() const final { return true; } 75 75 76 76 void paintSnapshotImage(PaintInfo&, const LayoutPoint&, Image&); 77 void paintContents(PaintInfo&, const LayoutPoint&) overridefinal;77 void paintContents(PaintInfo&, const LayoutPoint&) final; 78 78 79 bool requiresLayer() const overridefinal;79 bool requiresLayer() const final; 80 80 81 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) overridefinal;81 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final; 82 82 83 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) overridefinal;84 bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier, Element** stopElement) overridefinal;83 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) final; 84 bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier, Element** stopElement) final; 85 85 86 86 void setUnavailablePluginIndicatorIsPressed(bool); … … 90 90 LayoutRect unavailablePluginIndicatorBounds(const LayoutPoint&) const; 91 91 92 bool canHaveChildren() const overridefinal;92 bool canHaveChildren() const final; 93 93 virtual bool canHaveWidget() const { return true; } 94 94 -
trunk/Source/WebCore/rendering/RenderFlexibleBox.h
r197563 r197566 45 45 const char* renderName() const override; 46 46 47 bool avoidsFloats() const overridefinal { return true; }48 bool canDropAnonymousBlockChild() const overridefinal { return false; }49 void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) overridefinal;47 bool avoidsFloats() const final { return true; } 48 bool canDropAnonymousBlockChild() const final { return false; } 49 void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) final; 50 50 51 51 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const override; … … 86 86 typedef Vector<LayoutRect, 8> ChildFrameRects; 87 87 88 bool isFlexibleBox() const overridefinal { return true; }88 bool isFlexibleBox() const final { return true; } 89 89 bool hasOrthogonalFlow(RenderBox& child) const; 90 90 bool isColumnFlow() const; -
trunk/Source/WebCore/rendering/RenderFlowThread.h
r197563 r197566 77 77 const RenderRegionList& renderRegionList() const { return m_regionList; } 78 78 79 void updateLogicalWidth() overridefinal;79 void updateLogicalWidth() final; 80 80 void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logicalTop, LogicalExtentComputedValues&) const override; 81 81 … … 238 238 // Always create a RenderLayer for the RenderFlowThread so that we 239 239 // can easily avoid drawing the children directly. 240 bool requiresLayer() const overridefinal { return true; }240 bool requiresLayer() const final { return true; } 241 241 242 242 protected: -
trunk/Source/WebCore/rendering/RenderImage.h
r197563 r197566 73 73 74 74 protected: 75 bool needsPreferredWidthsRecalculation() const overridefinal;76 RenderBox* embeddedContentBox() const overridefinal;77 void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const overridefinal;75 bool needsPreferredWidthsRecalculation() const final; 76 RenderBox* embeddedContentBox() const final; 77 void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const final; 78 78 bool foregroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect, unsigned maxDepthToTest) const override; 79 79 … … 83 83 84 84 void paintIntoRect(GraphicsContext&, const FloatRect&); 85 void paint(PaintInfo&, const LayoutPoint&) overridefinal;85 void paint(PaintInfo&, const LayoutPoint&) final; 86 86 void layout() override; 87 87 … … 97 97 98 98 bool isImage() const override { return true; } 99 bool isRenderImage() const overridefinal { return true; }99 bool isRenderImage() const final { return true; } 100 100 101 101 void paintReplaced(PaintInfo&, const LayoutPoint&) override; 102 102 103 bool computeBackgroundIsKnownToBeObscured(const LayoutPoint& paintOffset) overridefinal;103 bool computeBackgroundIsKnownToBeObscured(const LayoutPoint& paintOffset) final; 104 104 105 105 LayoutUnit minimumReplacedHeight() const override; 106 106 107 void notifyFinished(CachedResource*) overridefinal;108 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) overridefinal;107 void notifyFinished(CachedResource*) final; 108 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final; 109 109 110 bool boxShadowShouldBeAppliedToBackground(const LayoutPoint& paintOffset, BackgroundBleedAvoidance, InlineFlowBox*) const overridefinal;110 bool boxShadowShouldBeAppliedToBackground(const LayoutPoint& paintOffset, BackgroundBleedAvoidance, InlineFlowBox*) const final; 111 111 112 112 virtual bool shadowControlsNeedCustomLayoutMetrics() const { return false; } -
trunk/Source/WebCore/rendering/RenderInline.h
r197563 r197566 40 40 void addChild(RenderObject* newChild, RenderObject* beforeChild = 0) override; 41 41 42 LayoutUnit marginLeft() const overridefinal;43 LayoutUnit marginRight() const overridefinal;44 LayoutUnit marginTop() const overridefinal;45 LayoutUnit marginBottom() const overridefinal;46 LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const overridefinal;47 LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const overridefinal;48 LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const overridefinal;49 LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const overridefinal;42 LayoutUnit marginLeft() const final; 43 LayoutUnit marginRight() const final; 44 LayoutUnit marginTop() const final; 45 LayoutUnit marginBottom() const final; 46 LayoutUnit marginBefore(const RenderStyle* otherStyle = 0) const final; 47 LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const final; 48 LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const final; 49 LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const final; 50 50 51 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const overridefinal;51 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final; 52 52 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override; 53 53 54 LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const overridefinal;54 LayoutSize offsetFromContainer(RenderElement&, const LayoutPoint&, bool* offsetDependsOnPoint = nullptr) const final; 55 55 56 IntRect borderBoundingBox() const overridefinal56 IntRect borderBoundingBox() const final 57 57 { 58 58 IntRect boundingBox = linesBoundingBox(); … … 81 81 #endif 82 82 83 RenderBoxModelObject* virtualContinuation() const overridefinal { return continuation(); }83 RenderBoxModelObject* virtualContinuation() const final { return continuation(); } 84 84 RenderInline* inlineElementContinuation() const; 85 85 86 void updateDragState(bool dragOn) overridefinal;86 void updateDragState(bool dragOn) final; 87 87 88 88 LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const; 89 89 90 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) overridefinal;90 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final; 91 91 void paintOutline(PaintInfo&, const LayoutPoint&); 92 92 … … 98 98 void updateAlwaysCreateLineBoxes(bool fullLayout); 99 99 100 LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine) overridefinal;100 LayoutRect localCaretRect(InlineBox*, int, LayoutUnit* extraWidthToEndOfLine) final; 101 101 102 102 bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset); … … 113 113 const char* renderName() const override; 114 114 115 bool canHaveChildren() const overridefinal { return true; }115 bool canHaveChildren() const final { return true; } 116 116 117 117 LayoutRect culledInlineVisualOverflowBoundingBox() const; … … 125 125 126 126 void addChildToContinuation(RenderObject* newChild, RenderObject* beforeChild); 127 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = nullptr) overridefinal;127 void addChildIgnoringContinuation(RenderObject* newChild, RenderObject* beforeChild = nullptr) final; 128 128 129 129 void splitInlines(RenderBlock* fromBlock, RenderBlock* toBlock, RenderBlock* middleBlock, … … 132 132 RenderObject* newChild, RenderBoxModelObject* oldCont); 133 133 134 void layout() overridefinal { ASSERT_NOT_REACHED(); } // Do nothing for layout()134 void layout() final { ASSERT_NOT_REACHED(); } // Do nothing for layout() 135 135 136 void paint(PaintInfo&, const LayoutPoint&) overridefinal;136 void paint(PaintInfo&, const LayoutPoint&) final; 137 137 138 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) overridefinal;138 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final; 139 139 140 140 bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath() || willChangeCreatesStackingContext(); } 141 141 142 LayoutUnit offsetLeft() const overridefinal;143 LayoutUnit offsetTop() const overridefinal;144 LayoutUnit offsetWidth() const overridefinal { return linesBoundingBox().width(); }145 LayoutUnit offsetHeight() const overridefinal { return linesBoundingBox().height(); }142 LayoutUnit offsetLeft() const final; 143 LayoutUnit offsetTop() const final; 144 LayoutUnit offsetWidth() const final { return linesBoundingBox().width(); } 145 LayoutUnit offsetHeight() const final { return linesBoundingBox().height(); } 146 146 147 147 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override; 148 LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const overridefinal;149 LayoutRect computeRectForRepaint(const LayoutRect&, const RenderLayerModelObject* repaintContainer, bool fixed) const overridefinal;148 LayoutRect rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const final; 149 LayoutRect computeRectForRepaint(const LayoutRect&, const RenderLayerModelObject* repaintContainer, bool fixed) const final; 150 150 151 151 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override; 152 152 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override; 153 153 154 VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) overridefinal;154 VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) final; 155 155 156 LayoutRect frameRectForStickyPositioning() const overridefinal { return linesBoundingBox(); }156 LayoutRect frameRectForStickyPositioning() const final { return linesBoundingBox(); } 157 157 158 158 virtual std::unique_ptr<InlineFlowBox> createInlineFlowBox(); // Subclassed by RenderSVGInline 159 159 160 void dirtyLinesFromChangedChild(RenderObject& child) overridefinal { m_lineBoxes.dirtyLinesFromChangedChild(*this, child); }160 void dirtyLinesFromChangedChild(RenderObject& child) final { m_lineBoxes.dirtyLinesFromChangedChild(*this, child); } 161 161 162 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const overridefinal;163 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const overridefinal;162 LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 163 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 164 164 165 void childBecameNonInline(RenderElement&) overridefinal;165 void childBecameNonInline(RenderElement&) final; 166 166 167 void updateHitTestResult(HitTestResult&, const LayoutPoint&) overridefinal;167 void updateHitTestResult(HitTestResult&, const LayoutPoint&) final; 168 168 169 void imageChanged(WrappedImagePtr, const IntRect* = 0) overridefinal;169 void imageChanged(WrappedImagePtr, const IntRect* = 0) final; 170 170 171 171 #if ENABLE(DASHBOARD_SUPPORT) 172 void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) overridefinal;172 void addAnnotatedRegions(Vector<AnnotatedRegionValue>&) final; 173 173 #endif 174 174 -
trunk/Source/WebCore/rendering/RenderMedia.h
r197563 r197566 48 48 void element() const = delete; 49 49 50 bool canHaveChildren() const overridefinal { return true; }50 bool canHaveChildren() const final { return true; } 51 51 52 52 const char* renderName() const override { return "RenderMedia"; } 53 bool isMedia() const overridefinal { return true; }54 bool isImage() const overridefinal { return false; }53 bool isMedia() const final { return true; } 54 bool isImage() const final { return false; } 55 55 void paintReplaced(PaintInfo&, const LayoutPoint&) override; 56 56 57 bool requiresForcedStyleRecalcPropagation() const overridefinal { return true; }57 bool requiresForcedStyleRecalcPropagation() const final { return true; } 58 58 59 59 bool shadowControlsNeedCustomLayoutMetrics() const override { return true; } 60 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;60 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 61 61 }; 62 62 -
trunk/Source/WebCore/rendering/RenderRegion.h
r197563 r197566 147 147 148 148 private: 149 bool isRenderRegion() const overridefinal { return true; }149 bool isRenderRegion() const final { return true; } 150 150 const char* renderName() const override { return "RenderRegion"; } 151 151 -
trunk/Source/WebCore/rendering/RenderRegionSet.h
r197563 r197566 54 54 55 55 private: 56 void installFlowThread() overridefinal;56 void installFlowThread() final; 57 57 58 58 const char* renderName() const override = 0; 59 59 60 bool isRenderRegionSet() const overridefinal { return true; }60 bool isRenderRegionSet() const final { return true; } 61 61 }; 62 62 -
trunk/Source/WebCore/rendering/RenderReplaced.h
r197563 r197566 46 46 void layout() override; 47 47 48 LayoutSize intrinsicSize() const overridefinal { return m_intrinsicSize; }48 LayoutSize intrinsicSize() const final { return m_intrinsicSize; } 49 49 void computeIntrinsicRatioInformation(FloatSize& intrinsicSize, double& intrinsicRatio) const override; 50 50 51 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const overridefinal;51 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final; 52 52 53 53 virtual LayoutUnit minimumReplacedHeight() const { return LayoutUnit(); } … … 75 75 bool canHaveChildren() const override { return false; } 76 76 77 void computePreferredLogicalWidths() overridefinal;77 void computePreferredLogicalWidths() final; 78 78 virtual void paintReplaced(PaintInfo&, const LayoutPoint&) { } 79 79 80 80 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override; 81 81 82 VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) overridefinal;82 VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) final; 83 83 84 84 bool canBeSelectionLeaf() const override { return true; } 85 85 86 LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) overridefinal;86 LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) final; 87 87 void computeAspectRatioInformationForRenderBox(RenderBox*, FloatSize& constrainedSize, double& intrinsicRatio) const; 88 88 -
trunk/Source/WebCore/rendering/RenderRuby.h
r197563 r197566 64 64 65 65 private: 66 bool isRubyInline() const overridefinal { return true; }66 bool isRubyInline() const final { return true; } 67 67 const char* renderName() const override { return "RenderRuby (inline)"; } 68 68 bool createsAnonymousWrapper() const override { return true; } … … 84 84 85 85 private: 86 bool isRubyBlock() const overridefinal { return true; }86 bool isRubyBlock() const final { return true; } 87 87 const char* renderName() const override { return "RenderRuby (block)"; } 88 88 bool createsAnonymousWrapper() const override { return true; } -
trunk/Source/WebCore/rendering/RenderTable.h
r197563 r197566 128 128 void recalcBordersInRowDirection(); 129 129 130 void addChild(RenderObject* child, RenderObject* beforeChild = 0) overridefinal;130 void addChild(RenderObject* child, RenderObject* beforeChild = 0) final; 131 131 132 132 struct ColumnStruct { … … 271 271 LayoutUnit offsetHeightForColumn(const RenderTableCol&) const; 272 272 273 void markForPaginationRelayoutIfNeeded() overridefinal;273 void markForPaginationRelayoutIfNeeded() final; 274 274 275 275 protected: 276 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;277 void simplifiedNormalFlowLayout() overridefinal;276 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 277 void simplifiedNormalFlowLayout() final; 278 278 279 279 private: 280 280 const char* renderName() const override { return "RenderTable"; } 281 281 282 bool isTable() const overridefinal { return true; }283 284 bool avoidsFloats() const overridefinal { return true; }285 286 void paint(PaintInfo&, const LayoutPoint&) overridefinal;287 void paintObject(PaintInfo&, const LayoutPoint&) overridefinal;288 void paintBoxDecorations(PaintInfo&, const LayoutPoint&) overridefinal;289 void paintMask(PaintInfo&, const LayoutPoint&) overridefinal;290 void layout() overridefinal;291 void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const overridefinal;282 bool isTable() const final { return true; } 283 284 bool avoidsFloats() const final { return true; } 285 286 void paint(PaintInfo&, const LayoutPoint&) final; 287 void paintObject(PaintInfo&, const LayoutPoint&) final; 288 void paintBoxDecorations(PaintInfo&, const LayoutPoint&) final; 289 void paintMask(PaintInfo&, const LayoutPoint&) final; 290 void layout() final; 291 void computeIntrinsicLogicalWidths(LayoutUnit& minWidth, LayoutUnit& maxWidth) const final; 292 292 void computePreferredLogicalWidths() override; 293 293 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override; 294 294 295 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const overridefinal;295 int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const final; 296 296 Optional<int> firstLineBaseline() const override; 297 Optional<int> inlineBlockBaseline(LineDirectionMode) const overridefinal;297 Optional<int> inlineBlockBaseline(LineDirectionMode) const final; 298 298 299 299 RenderTableCol* slowColElement(unsigned col, bool* startEdge, bool* endEdge) const; … … 304 304 void invalidateCachedColumnOffsets(); 305 305 306 RenderBlock* firstLineBlock() const overridefinal;307 void updateFirstLetter() overridefinal;308 309 void updateLogicalWidth() overridefinal;306 RenderBlock* firstLineBlock() const final; 307 void updateFirstLetter() final; 308 309 void updateLogicalWidth() final; 310 310 311 311 LayoutUnit convertStyleLogicalWidthToComputedWidth(const Length& styleLogicalWidth, LayoutUnit availableWidth); 312 312 LayoutUnit convertStyleLogicalHeightToComputedHeight(const Length& styleLogicalHeight); 313 313 314 LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground) overridefinal;314 LayoutRect overflowClipRect(const LayoutPoint& location, RenderRegion*, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize, PaintPhase = PaintPhaseBlockBackground) final; 315 315 LayoutRect overflowClipRectForChildLayers(const LayoutPoint& location, RenderRegion* region, OverlayScrollbarSizeRelevancy relevancy) override { return RenderBox::overflowClipRect(location, region, relevancy); } 316 316 317 void addOverflowFromChildren() overridefinal;317 void addOverflowFromChildren() final; 318 318 319 319 void subtractCaptionRect(LayoutRect&) const; -
trunk/Source/WebCore/rendering/RenderText.h
r197563 r197566 69 69 void dirtyLineBoxes(bool fullLayout); 70 70 71 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const overridefinal;71 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final; 72 72 Vector<IntRect> absoluteRectsForRange(unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr) const; 73 73 #if PLATFORM(IOS) … … 75 75 #endif 76 76 77 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overridefinal;77 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final; 78 78 Vector<FloatQuad> absoluteQuadsForRange(unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false, bool* wasFixed = nullptr) const; 79 79 … … 117 117 118 118 bool canBeSelectionLeaf() const override { return true; } 119 void setSelectionState(SelectionState) overridefinal;119 void setSelectionState(SelectionState) final; 120 120 LayoutRect selectionRectForRepaint(const RenderLayerModelObject* repaintContainer, bool clipToVisibleContent = true) override; 121 121 LayoutRect localCaretRect(InlineBox*, int caretOffset, LayoutUnit* extraWidthToEndOfLine = 0) override; … … 126 126 LayoutUnit marginRight() const { return minimumValueForLength(style().marginRight(), 0); } 127 127 128 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const overridefinal;128 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const final; 129 129 130 130 InlineTextBox* firstTextBox() const { return m_lineBoxes.first(); } … … 138 138 bool hasRenderedText() const; 139 139 140 int previousOffset(int current) const overridefinal;141 int previousOffsetForBackwardDeletion(int current) const overridefinal;142 int nextOffset(int current) const overridefinal;140 int previousOffset(int current) const final; 141 int previousOffsetForBackwardDeletion(int current) const final; 142 int nextOffset(int current) const final; 143 143 144 144 bool containsReversedText() const { return m_containsReversedText; } … … 181 181 RenderText(Node&, const String&); 182 182 183 bool canHaveChildren() const overridefinal { return false; }183 bool canHaveChildren() const final { return false; } 184 184 185 185 void computePreferredLogicalWidths(float leadWidth, HashSet<const Font*>& fallbackFonts, GlyphOverflow&); … … 190 190 // will use the more efficient textLength() instead, while 191 191 // callers with a RenderObject* can continue to use length(). 192 unsigned length() const overridefinal { return textLength(); }193 194 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) overridefinal { ASSERT_NOT_REACHED(); return false; }192 unsigned length() const final { return textLength(); } 193 194 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation&, const LayoutPoint&, HitTestAction) final { ASSERT_NOT_REACHED(); return false; } 195 195 196 196 bool containsOnlyWhitespace(unsigned from, unsigned len) const; -
trunk/Source/WebCore/rendering/RenderTextControl.h
r197563 r197566 72 72 73 73 const char* renderName() const override { return "RenderTextControl"; } 74 bool isTextControl() const overridefinal { return true; }74 bool isTextControl() const final { return true; } 75 75 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override; 76 76 void computePreferredLogicalWidths() override; -
trunk/Source/WebCore/rendering/RenderTextControlSingleLine.h
r197563 r197566 49 49 bool hasControlClip() const override; 50 50 LayoutRect controlClipRect(const LayoutPoint&) const override; 51 bool isTextField() const overridefinal { return true; }51 bool isTextField() const final { return true; } 52 52 53 53 void layout() override; … … 64 64 void setScrollLeft(int) override; 65 65 void setScrollTop(int) override; 66 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) overridefinal;67 bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) overridefinal;66 bool scroll(ScrollDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = nullptr, RenderBox* startBox = nullptr, const IntPoint& wheelEventAbsolutePoint = IntPoint()) final; 67 bool logicalScroll(ScrollLogicalDirection, ScrollGranularity, float multiplier = 1, Element** stopElement = 0) final; 68 68 69 69 int textBlockWidth() const; -
trunk/Source/WebCore/rendering/RenderWidget.h
r197563 r197566 82 82 RenderWidget(HTMLFrameOwnerElement&, Ref<RenderStyle>&&); 83 83 84 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;84 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 85 85 void layout() override; 86 86 void paint(PaintInfo&, const LayoutPoint&) override; … … 92 92 void element() const = delete; 93 93 94 bool isWidget() const overridefinal { return true; }94 bool isWidget() const final { return true; } 95 95 96 bool needsPreferredWidthsRecalculation() const overridefinal;97 RenderBox* embeddedContentBox() const overridefinal;96 bool needsPreferredWidthsRecalculation() const final; 97 RenderBox* embeddedContentBox() const final; 98 98 99 void willBeDestroyed() overridefinal;100 void setSelectionState(SelectionState) overridefinal;101 void setOverlapTestResult(bool) overridefinal;99 void willBeDestroyed() final; 100 void setSelectionState(SelectionState) final; 101 void setOverlapTestResult(bool) final; 102 102 103 103 bool setWidgetGeometry(const LayoutRect&); -
trunk/Source/WebCore/rendering/RootInlineBox.h
r197563 r197566 48 48 RootInlineBox* prevRootBox() const; 49 49 50 void adjustPosition(float dx, float dy) overridefinal;50 void adjustPosition(float dx, float dy) final; 51 51 52 52 LayoutUnit lineTop() const { return m_lineTop; } … … 105 105 float placeEllipsis(const AtomicString& ellipsisStr, bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, InlineBox* markupBox = nullptr); 106 106 // Return the position of the EllipsisBox or -1. 107 float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) overridefinal;107 float placeEllipsisBox(bool ltr, float blockLeftEdge, float blockRightEdge, float ellipsisWidth, float &truncatedWidth, bool& foundBox) final; 108 108 109 109 using InlineBox::hasEllipsisBox; … … 112 112 void paintEllipsisBox(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) const; 113 113 114 void clearTruncation() overridefinal;114 void clearTruncation() final; 115 115 116 116 bool isHyphenated() const; 117 117 118 int baselinePosition(FontBaseline baselineType) const overridefinal;119 LayoutUnit lineHeight() const overridefinal;118 int baselinePosition(FontBaseline baselineType) const final; 119 LayoutUnit lineHeight() const final; 120 120 121 121 void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; … … 125 125 using InlineBox::setHasSelectedChildren; 126 126 127 RenderObject::SelectionState selectionState() overridefinal;127 RenderObject::SelectionState selectionState() final; 128 128 InlineBox* firstSelectedBox(); 129 129 InlineBox* lastSelectedBox(); … … 155 155 Vector<RenderBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); } 156 156 157 void extractLineBoxFromRenderObject() overridefinal;158 void attachLineBoxToRenderObject() overridefinal;159 void removeLineBoxFromRenderObject() overridefinal;157 void extractLineBoxFromRenderObject() final; 158 void attachLineBoxToRenderObject() final; 159 void removeLineBoxFromRenderObject() final; 160 160 161 161 FontBaseline baselineType() const { return static_cast<FontBaseline>(m_baselineType); } … … 192 192 193 193 #if ENABLE(TREE_DEBUGGING) 194 const char* boxName() const overridefinal;194 const char* boxName() const final; 195 195 #endif 196 196 private: 197 bool isRootInlineBox() const overridefinal { return true; }197 bool isRootInlineBox() const final { return true; } 198 198 199 199 bool includeLeadingForBox(InlineBox&) const; -
trunk/Source/WebCore/rendering/mathml/RenderMathMLBlock.h
r197563 r197566 66 66 67 67 private: 68 bool isRenderMathMLBlock() const overridefinal { return true; }68 bool isRenderMathMLBlock() const final { return true; } 69 69 const char* renderName() const override; 70 70 bool isFlexibleBoxImpl() const override { return true; } -
trunk/Source/WebCore/rendering/mathml/RenderMathMLOperator.h
r197563 r197566 53 53 bool isVertical() const { return m_isVertical; } 54 54 55 void updateStyle() overridefinal;55 void updateStyle() final; 56 56 57 57 void paint(PaintInfo&, const LayoutPoint&) override; 58 58 59 59 void updateTokenContent(const String& operatorString); 60 void updateTokenContent() overridefinal;60 void updateTokenContent() final; 61 61 void updateOperatorProperties(); 62 62 void setOperatorFlagAndScheduleLayoutIfNeeded(MathMLOperatorDictionary::Flag, const AtomicString& attributeValue); -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.h
r197563 r197566 59 59 60 60 private: 61 bool isRenderMathMLRoot() const overridefinal { return true; }61 bool isRenderMathMLRoot() const final { return true; } 62 62 const char* renderName() const override { return "RenderMathMLRoot"; } 63 63 Optional<int> firstLineBaseline() const override; -
trunk/Source/WebCore/rendering/mathml/RenderMathMLRow.h
r197563 r197566 47 47 48 48 private: 49 bool isRenderMathMLRow() const overridefinal { return true; }49 bool isRenderMathMLRow() const final { return true; } 50 50 const char* renderName() const override { return isAnonymous() ? "RenderMathMLRow (anonymous)" : "RenderMathMLRow"; } 51 51 }; -
trunk/Source/WebCore/rendering/mathml/RenderMathMLScripts.h
r197563 r197566 59 59 60 60 const char* renderName() const override { return m_kind == Base ? "Base Wrapper" : "SubSupPair Wrapper"; } 61 bool isRenderMathMLScriptsWrapper() const overridefinal { return true; }61 bool isRenderMathMLScriptsWrapper() const final { return true; } 62 62 63 63 RenderMathMLScripts* parentMathMLScripts(); -
trunk/Source/WebCore/rendering/mathml/RenderMathMLToken.h
r197563 r197566 51 51 52 52 private: 53 bool isRenderMathMLToken() const overridefinal { return true; }53 bool isRenderMathMLToken() const final { return true; } 54 54 const char* renderName() const override { return isAnonymous() ? "RenderMathMLToken (anonymous)" : "RenderMathMLToken"; } 55 55 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; -
trunk/Source/WebCore/rendering/svg/RenderSVGBlock.h
r197563 r197566 31 31 class RenderSVGBlock : public RenderBlockFlow { 32 32 public: 33 LayoutRect visualOverflowRect() const overridefinal;33 LayoutRect visualOverflowRect() const final; 34 34 35 35 SVGGraphicsElement& graphicsElement() const { return downcast<SVGGraphicsElement>(nodeForNonAnonymous()); } … … 42 42 void element() const = delete; 43 43 44 void updateFromStyle() overridefinal;44 void updateFromStyle() final; 45 45 46 bool isRenderSVGBlock() const overridefinal { return true; }46 bool isRenderSVGBlock() const final { return true; } 47 47 48 48 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override; 49 49 50 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;50 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 51 51 }; 52 52 -
trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h
r197563 r197566 35 35 36 36 void paint(PaintInfo&, const LayoutPoint&) override; 37 void setNeedsBoundariesUpdate() overridefinal { m_needsBoundariesUpdate = true; }38 bool needsBoundariesUpdate() overridefinal { return m_needsBoundariesUpdate; }37 void setNeedsBoundariesUpdate() final { m_needsBoundariesUpdate = true; } 38 bool needsBoundariesUpdate() final { return m_needsBoundariesUpdate; } 39 39 virtual bool didTransformToRootUpdate() { return false; } 40 40 bool isObjectBoundingBoxValid() const { return m_objectBoundingBoxValid; } … … 45 45 const char* renderName() const override { return "RenderSVGContainer"; } 46 46 47 bool canHaveChildren() const overridefinal { return true; }47 bool canHaveChildren() const final { return true; } 48 48 49 49 void layout() override; 50 50 51 void addChild(RenderObject* child, RenderObject* beforeChild = 0) overridefinal;52 void removeChild(RenderObject&) overridefinal;53 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) overridefinal;51 void addChild(RenderObject* child, RenderObject* beforeChild = 0) final; 52 void removeChild(RenderObject&) final; 53 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final; 54 54 55 FloatRect objectBoundingBox() const overridefinal { return m_objectBoundingBox; }56 FloatRect strokeBoundingBox() const overridefinal { return m_strokeBoundingBox; }57 FloatRect repaintRectInLocalCoordinates() const overridefinal { return m_repaintBoundingBox; }55 FloatRect objectBoundingBox() const final { return m_objectBoundingBox; } 56 FloatRect strokeBoundingBox() const final { return m_strokeBoundingBox; } 57 FloatRect repaintRectInLocalCoordinates() const final { return m_repaintBoundingBox; } 58 58 59 59 bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override; … … 73 73 74 74 private: 75 bool isSVGContainer() const overridefinal { return true; }75 bool isSVGContainer() const final { return true; } 76 76 77 77 FloatRect m_objectBoundingBox; -
trunk/Source/WebCore/rendering/svg/RenderSVGHiddenContainer.h
r197563 r197566 37 37 38 38 private: 39 bool isSVGHiddenContainer() const overridefinal { return true; }39 bool isSVGHiddenContainer() const final { return true; } 40 40 const char* renderName() const override { return "RenderSVGHiddenContainer"; } 41 41 42 void paint(PaintInfo&, const LayoutPoint&) overridefinal;42 void paint(PaintInfo&, const LayoutPoint&) final; 43 43 44 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const overridefinal { return LayoutRect(); }45 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overridefinal;44 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const final { return LayoutRect(); } 45 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final; 46 46 47 bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) overridefinal;47 bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) final; 48 48 }; 49 49 } -
trunk/Source/WebCore/rendering/svg/RenderSVGInline.h
r197563 r197566 37 37 38 38 const char* renderName() const override { return "RenderSVGInline"; } 39 bool requiresLayer() const overridefinal { return false; }40 bool isSVGInline() const overridefinal { return true; }39 bool requiresLayer() const final { return false; } 40 bool isSVGInline() const final { return true; } 41 41 42 void updateFromStyle() overridefinal;42 void updateFromStyle() final; 43 43 44 44 // Chapter 10.4 of the SVG Specification say that we should use the … … 47 47 // It is also necessary to take the stroke and repaint rect of 48 48 // this element, since we need it for filters. 49 FloatRect objectBoundingBox() const overridefinal;50 FloatRect strokeBoundingBox() const overridefinal;51 FloatRect repaintRectInLocalCoordinates() const overridefinal;49 FloatRect objectBoundingBox() const final; 50 FloatRect strokeBoundingBox() const final; 51 FloatRect repaintRectInLocalCoordinates() const final; 52 52 53 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const overridefinal;54 FloatRect computeFloatRectForRepaint(const FloatRect&, const RenderLayerModelObject* repaintContainer, bool fixed = false) const overridefinal;55 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const overridefinal;56 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const overridefinal;57 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const overridefinal;53 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const final; 54 FloatRect computeFloatRectForRepaint(const FloatRect&, const RenderLayerModelObject* repaintContainer, bool fixed = false) const final; 55 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const final; 56 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const final; 57 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const final; 58 58 59 std::unique_ptr<InlineFlowBox> createInlineFlowBox() overridefinal;59 std::unique_ptr<InlineFlowBox> createInlineFlowBox() final; 60 60 61 void willBeDestroyed() overridefinal;62 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;61 void willBeDestroyed() final; 62 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 63 63 64 void addChild(RenderObject* child, RenderObject* beforeChild = nullptr) overridefinal;65 void removeChild(RenderObject&) overridefinal;64 void addChild(RenderObject* child, RenderObject* beforeChild = nullptr) final; 65 void removeChild(RenderObject&) final; 66 66 }; 67 67 -
trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h
r197563 r197566 48 48 public: 49 49 LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject* repaintContainer) const override; 50 FloatRect computeFloatRectForRepaint(const FloatRect&, const RenderLayerModelObject* repaintContainer, bool fixed = false) const overridefinal;51 LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const overridefinal;50 FloatRect computeFloatRectForRepaint(const FloatRect&, const RenderLayerModelObject* repaintContainer, bool fixed = false) const final; 51 LayoutRect outlineBoundsForRepaint(const RenderLayerModelObject* repaintContainer, const RenderGeometryMap*) const final; 52 52 53 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const overridefinal;53 void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const final; 54 54 void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override; 55 55 56 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const overridefinal;57 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const overridefinal;56 void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const final; 57 const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const final; 58 58 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override; 59 59 … … 73 73 74 74 private: 75 bool isRenderSVGModelObject() const overridefinal { return true; }75 bool isRenderSVGModelObject() const final { return true; } 76 76 77 77 // This method should never be called, SVG uses a different nodeAtPoint method 78 78 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) override; 79 void absoluteFocusRingQuads(Vector<FloatQuad>&) overridefinal;79 void absoluteFocusRingQuads(Vector<FloatQuad>&) final; 80 80 bool m_hasSVGShadow; 81 81 }; -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h
r197563 r197566 34 34 35 35 void layout() override; 36 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) overridefinal;36 void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final; 37 37 38 bool isSVGResourceContainer() const overridefinal { return true; }38 bool isSVGResourceContainer() const final { return true; } 39 39 40 40 static bool shouldTransformOnTextPainting(const RenderElement&, AffineTransform&); … … 67 67 void removeClient(RenderElement&); 68 68 69 void willBeDestroyed() overridefinal;69 void willBeDestroyed() final; 70 70 void registerResource(); 71 71 -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h
r197563 r197566 45 45 SVGGradientElement& gradientElement() const { return static_cast<SVGGradientElement&>(RenderSVGResourceContainer::element()); } 46 46 47 void removeAllClientsFromCache(bool markForInvalidation = true) overridefinal;48 void removeClientFromCache(RenderElement&, bool markForInvalidation = true) overridefinal;47 void removeAllClientsFromCache(bool markForInvalidation = true) final; 48 void removeClientFromCache(RenderElement&, bool markForInvalidation = true) final; 49 49 50 bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) overridefinal;51 void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) overridefinal;52 FloatRect resourceBoundingBox(const RenderObject&) overridefinal { return FloatRect(); }50 bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) final; 51 void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) final; 52 FloatRect resourceBoundingBox(const RenderObject&) final { return FloatRect(); } 53 53 54 54 protected: -
trunk/Source/WebCore/rendering/svg/RenderSVGShape.h
r197563 r197566 52 52 53 53 void setNeedsShapeUpdate() { m_needsShapeUpdate = true; } 54 void setNeedsBoundariesUpdate() overridefinal { m_needsBoundariesUpdate = true; }55 bool needsBoundariesUpdate() overridefinal { return m_needsBoundariesUpdate; }56 void setNeedsTransformUpdate() overridefinal { m_needsTransformUpdate = true; }54 void setNeedsBoundariesUpdate() final { m_needsBoundariesUpdate = true; } 55 bool needsBoundariesUpdate() final { return m_needsBoundariesUpdate; } 56 void setNeedsTransformUpdate() final { m_needsTransformUpdate = true; } 57 57 virtual void fillShape(GraphicsContext&) const; 58 58 virtual void strokeShape(GraphicsContext&) const; … … 88 88 bool strokeContains(const FloatPoint&, bool requiresStroke = true); 89 89 90 FloatRect repaintRectInLocalCoordinates() const overridefinal { return m_repaintBoundingBox; }91 FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const overridefinal { return m_repaintBoundingBoxExcludingShadow; }92 const AffineTransform& localToParentTransform() const overridefinal { return m_localTransform; }93 AffineTransform localTransform() const overridefinal { return m_localTransform; }90 FloatRect repaintRectInLocalCoordinates() const final { return m_repaintBoundingBox; } 91 FloatRect repaintRectInLocalCoordinatesExcludingSVGShadow() const final { return m_repaintBoundingBoxExcludingShadow; } 92 const AffineTransform& localToParentTransform() const final { return m_localTransform; } 93 AffineTransform localTransform() const final { return m_localTransform; } 94 94 95 bool isSVGShape() const overridefinal { return true; }96 bool canHaveChildren() const overridefinal { return false; }95 bool isSVGShape() const final { return true; } 96 bool canHaveChildren() const final { return false; } 97 97 const char* renderName() const override { return "RenderSVGShape"; } 98 98 99 void layout() overridefinal;100 void paint(PaintInfo&, const LayoutPoint&) overridefinal;101 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) overridefinal;99 void layout() final; 100 void paint(PaintInfo&, const LayoutPoint&) final; 101 void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final; 102 102 103 bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) overridefinal;103 bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) final; 104 104 105 FloatRect objectBoundingBox() const overridefinal { return m_fillBoundingBox; }106 FloatRect strokeBoundingBox() const overridefinal { return m_strokeBoundingBox; }105 FloatRect objectBoundingBox() const final { return m_fillBoundingBox; } 106 FloatRect strokeBoundingBox() const final { return m_strokeBoundingBox; } 107 107 FloatRect calculateObjectBoundingBox() const; 108 108 FloatRect calculateStrokeBoundingBox() const; -
trunk/Source/WebCore/rendering/svg/SVGRootInlineBox.h
r197563 r197566 48 48 InlineBox* closestLeafChildForPosition(const LayoutPoint&); 49 49 50 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) overridefinal;50 bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) final; 51 51 52 52 private: -
trunk/Source/WebCore/replay/EventLoopInput.h
r197563 r197566 58 58 public: 59 59 virtual ~EventLoopInputBase() { } 60 InputQueue queue() const overridefinal { return InputQueue::EventLoopInput; }60 InputQueue queue() const final { return InputQueue::EventLoopInput; } 61 61 62 62 virtual void dispatch(ReplayController&) = 0; … … 66 66 class EventLoopInput : public EventLoopInputBase { 67 67 public: 68 const String& type() const overridefinal68 const String& type() const final 69 69 { 70 70 return InputTraits<InputType>::type(); -
trunk/Source/WebCore/replay/MemoizedDOMResult.h
r197563 r197566 77 77 78 78 virtual EncodedValue encodedResult() const = 0; 79 InputQueue queue() const final override{ return InputQueue::ScriptMemoizedData; }80 const String& type() const final override;79 InputQueue queue() const final { return InputQueue::ScriptMemoizedData; } 80 const String& type() const final; 81 81 82 82 const String& attribute() const { return m_attribute; } -
trunk/Source/WebCore/svg/SVGElement.h
r197563 r197566 187 187 188 188 private: 189 RenderStyle* computedStyle(PseudoId = NOPSEUDO) overridefinal;189 RenderStyle* computedStyle(PseudoId = NOPSEUDO) final; 190 190 bool willRecalcStyle(Style::Change) override; 191 191 -
trunk/Source/WebCore/svg/SVGTextContentElement.h
r197563 r197566 105 105 106 106 private: 107 bool isTextContent() const overridefinal { return true; }107 bool isTextContent() const final { return true; } 108 108 109 109 static bool isSupportedAttribute(const QualifiedName&); -
trunk/Source/WebCore/svg/SVGTextPositioningElement.h
r197563 r197566 39 39 40 40 private: 41 bool isPresentationAttribute(const QualifiedName&) const overridefinal;42 void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) overridefinal;41 bool isPresentationAttribute(const QualifiedName&) const final; 42 void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) final; 43 43 44 44 BEGIN_DECLARE_ANIMATED_PROPERTIES(SVGTextPositioningElement) -
trunk/Source/WebCore/svg/animation/SVGSMILElement.h
r197563 r197566 207 207 SMILTime calculateNextProgressTime(SMILTime elapsed) const; 208 208 209 bool isSMILElement() const overridefinal { return true; }209 bool isSMILElement() const final { return true; } 210 210 211 211 SVGElement* m_targetElement; -
trunk/Source/WebCore/svg/graphics/filters/SVGFilter.h
r197563 r197566 47 47 FloatRect targetBoundingBox() const { return m_targetBoundingBox; } 48 48 49 bool isSVGFilter() const overridefinal { return true; }49 bool isSVGFilter() const final { return true; } 50 50 51 51 private: -
trunk/Source/WebCore/workers/AbstractWorker.h
r197563 r197566 59 59 60 60 private: 61 void refEventTarget() overridefinal { ref(); }62 void derefEventTarget() overridefinal { deref(); }61 void refEventTarget() final { ref(); } 62 void derefEventTarget() final { deref(); } 63 63 }; 64 64 -
trunk/Source/WebCore/workers/Worker.h
r197563 r197566 63 63 64 64 // EventTarget API. 65 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return ActiveDOMObject::scriptExecutionContext(); }65 ScriptExecutionContext* scriptExecutionContext() const final { return ActiveDOMObject::scriptExecutionContext(); } 66 66 67 67 // ActiveDOMObject API. -
trunk/Source/WebCore/workers/WorkerGlobalScope.h
r197563 r197566 61 61 bool isWorkerGlobalScope() const override { return true; } 62 62 63 ScriptExecutionContext* scriptExecutionContext() const overridefinal { return const_cast<WorkerGlobalScope*>(this); }63 ScriptExecutionContext* scriptExecutionContext() const final { return const_cast<WorkerGlobalScope*>(this); } 64 64 65 65 virtual bool isDedicatedWorkerGlobalScope() const { return false; } 66 66 67 const URL& url() const overridefinal { return m_url; }68 URL completeURL(const String&) const overridefinal;67 const URL& url() const final { return m_url; } 68 URL completeURL(const String&) const final; 69 69 70 70 String userAgent(const URL&) const override; … … 72 72 void disableEval(const String& errorMessage) override; 73 73 74 bool shouldBypassMainWorldContentSecurityPolicy() const overridefinal { return m_shouldBypassMainWorldContentSecurityPolicy; }74 bool shouldBypassMainWorldContentSecurityPolicy() const final { return m_shouldBypassMainWorldContentSecurityPolicy; } 75 75 76 76 WorkerScriptController* script() { return m_script.get(); } … … 149 149 void derefScriptExecutionContext() override { deref(); } 150 150 151 void refEventTarget() overridefinal { ref(); }152 void derefEventTarget() overridefinal { deref(); }151 void refEventTarget() final { ref(); } 152 void derefEventTarget() final { deref(); } 153 153 154 154 void addMessage(MessageSource, MessageLevel, const String& message, const String& sourceURL, unsigned lineNumber, unsigned columnNumber, RefPtr<Inspector::ScriptCallStack>&&, JSC::ExecState* = 0, unsigned long requestIdentifier = 0) override; … … 156 156 EventTarget* errorEventTarget() override; 157 157 158 WorkerEventQueue& eventQueue() const overridefinal;158 WorkerEventQueue& eventQueue() const final; 159 159 160 160 URL m_url; -
trunk/Source/WebCore/xml/XMLHttpRequestUpload.h
r197563 r197566 53 53 54 54 private: 55 void refEventTarget() overridefinal { ref(); }56 void derefEventTarget() overridefinal { deref(); }55 void refEventTarget() final { ref(); } 56 void derefEventTarget() final { deref(); } 57 57 58 58 XMLHttpRequest* m_xmlHttpRequest; -
trunk/Source/WebKit2/DatabaseProcess/IndexedDB/WebIDBConnectionToClient.h
r197563 r197566 53 53 54 54 WebCore::IDBServer::IDBConnectionToClient& connectionToClient(); 55 uint64_t identifier() const overridefinal { return m_identifier; }56 uint64_t messageSenderDestinationID() overridefinal { return m_identifier; }55 uint64_t identifier() const final { return m_identifier; } 56 uint64_t messageSenderDestinationID() final { return m_identifier; } 57 57 58 58 // IDBConnectionToClientDelegate 59 void didDeleteDatabase(const WebCore::IDBResultData&) overridefinal;60 void didOpenDatabase(const WebCore::IDBResultData&) overridefinal;61 void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) overridefinal;62 void didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) overridefinal;63 void didCreateObjectStore(const WebCore::IDBResultData&) overridefinal;64 void didDeleteObjectStore(const WebCore::IDBResultData&) overridefinal;65 void didClearObjectStore(const WebCore::IDBResultData&) overridefinal;66 void didCreateIndex(const WebCore::IDBResultData&) overridefinal;67 void didDeleteIndex(const WebCore::IDBResultData&) overridefinal;68 void didPutOrAdd(const WebCore::IDBResultData&) overridefinal;69 void didGetRecord(const WebCore::IDBResultData&) overridefinal;70 void didGetCount(const WebCore::IDBResultData&) overridefinal;71 void didDeleteRecord(const WebCore::IDBResultData&) overridefinal;72 void didOpenCursor(const WebCore::IDBResultData&) overridefinal;73 void didIterateCursor(const WebCore::IDBResultData&) overridefinal;59 void didDeleteDatabase(const WebCore::IDBResultData&) final; 60 void didOpenDatabase(const WebCore::IDBResultData&) final; 61 void didAbortTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) final; 62 void didCommitTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) final; 63 void didCreateObjectStore(const WebCore::IDBResultData&) final; 64 void didDeleteObjectStore(const WebCore::IDBResultData&) final; 65 void didClearObjectStore(const WebCore::IDBResultData&) final; 66 void didCreateIndex(const WebCore::IDBResultData&) final; 67 void didDeleteIndex(const WebCore::IDBResultData&) final; 68 void didPutOrAdd(const WebCore::IDBResultData&) final; 69 void didGetRecord(const WebCore::IDBResultData&) final; 70 void didGetCount(const WebCore::IDBResultData&) final; 71 void didDeleteRecord(const WebCore::IDBResultData&) final; 72 void didOpenCursor(const WebCore::IDBResultData&) final; 73 void didIterateCursor(const WebCore::IDBResultData&) final; 74 74 75 void fireVersionChangeEvent(WebCore::IDBServer::UniqueIDBDatabaseConnection&, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion) overridefinal;76 void didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) overridefinal;77 void notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion) overridefinal;75 void fireVersionChangeEvent(WebCore::IDBServer::UniqueIDBDatabaseConnection&, const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t requestedVersion) final; 76 void didStartTransaction(const WebCore::IDBResourceIdentifier& transactionIdentifier, const WebCore::IDBError&) final; 77 void notifyOpenDBRequestBlocked(const WebCore::IDBResourceIdentifier& requestIdentifier, uint64_t oldVersion, uint64_t newVersion) final; 78 78 79 79 void ref() override { RefCounted<WebIDBConnectionToClient>::ref(); } … … 110 110 WebIDBConnectionToClient(DatabaseToWebProcessConnection&, uint64_t serverConnectionIdentifier); 111 111 112 IPC::Connection* messageSenderConnection() overridefinal;112 IPC::Connection* messageSenderConnection() final; 113 113 114 114 Ref<DatabaseToWebProcessConnection> m_connection; -
trunk/Source/WebKit2/NetworkProcess/CustomProtocols/soup/CustomProtocolManagerImpl.h
r185551 r197566 55 55 56 56 private: 57 void start(GTask*) final override;58 GInputStream* finish(GTask*, GError**) final override;57 void start(GTask*) final; 58 GInputStream* finish(GTask*, GError**) final; 59 59 60 60 ChildProcess* m_childProcess; -
trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h
r197563 r197566 65 65 66 66 // NetworkDataTaskClient 67 void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, RedirectCompletionHandler) final override;68 void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) final override;69 void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) final override;70 void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) final override;71 void didCompleteWithError(const WebCore::ResourceError&) final override;72 void didBecomeDownload() final override;67 void willPerformHTTPRedirection(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, RedirectCompletionHandler) final; 68 void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) final; 69 void didReceiveResponseNetworkSession(const WebCore::ResourceResponse&, ResponseCompletionHandler) final; 70 void didReceiveData(RefPtr<WebCore::SharedBuffer>&&) final; 71 void didCompleteWithError(const WebCore::ResourceError&) final; 72 void didBecomeDownload() final; 73 73 void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend) override; 74 74 void wasBlocked() override; -
trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h
r197563 r197566 105 105 // Auxiliary Client Creation 106 106 #if ENABLE(FULLSCREEN_API) 107 virtualWebFullScreenManagerProxyClient& fullScreenManagerProxyClient() final;107 WebFullScreenManagerProxyClient& fullScreenManagerProxyClient() final; 108 108 #endif 109 109 -
trunk/Source/WebKit2/UIProcess/GenericCallback.h
r197563 r197566 120 120 } 121 121 122 void invalidate(Error error = Error::Unknown) overridefinal122 void invalidate(Error error = Error::Unknown) final 123 123 { 124 124 if (!m_callback) -
trunk/Source/WebKit2/UIProcess/efl/WebView.h
r197563 r197566 231 231 #endif 232 232 233 void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&) overridefinal { }233 void didFinishLoadingDataForCustomContentProvider(const String& suggestedFilename, const IPC::DataReference&) final { } 234 234 235 235 void navigationGestureDidBegin() override { } … … 240 240 void didRemoveNavigationGestureSnapshot() override { } 241 241 242 void didFirstVisuallyNonEmptyLayoutForMainFrame() overridefinal { }243 void didFinishLoadForMainFrame() overridefinal { }242 void didFirstVisuallyNonEmptyLayoutForMainFrame() final { } 243 void didFinishLoadForMainFrame() final { } 244 244 void didFailLoadForMainFrame() override { } 245 void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) overridefinal { }245 void didSameDocumentNavigationForMainFrame(SameDocumentNavigationType) final { } 246 246 247 247 void didChangeBackgroundColor() override { } 248 248 249 void refView() overridefinal { }250 void derefView() overridefinal { }249 void refView() final { } 250 void derefView() final { } 251 251 252 252 #if ENABLE(VIDEO) && USE(GSTREAMER) 253 bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) overridefinal { return false; };253 bool decidePolicyForInstallMissingMediaPluginsPermissionRequest(InstallMissingMediaPluginsPermissionRequest&) final { return false; }; 254 254 #endif 255 255 … … 259 259 // WebFullScreenManagerProxyClient 260 260 void closeFullScreenManager() override { } 261 bool isFullScreen() overridefinal;262 void enterFullScreen() overridefinal;263 void exitFullScreen() overridefinal;261 bool isFullScreen() final; 262 void enterFullScreen() final; 263 void exitFullScreen() final; 264 264 void beganEnterFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) override { } 265 265 void beganExitFullScreen(const WebCore::IntRect&, const WebCore::IntRect&) override { } -
trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBConnectionToServer.h
r197563 r197566 41 41 42 42 WebCore::IDBClient::IDBConnectionToServer& coreConnectionToServer(); 43 uint64_t identifier() const overridefinal { return m_identifier; }44 uint64_t messageSenderDestinationID() overridefinal { return m_identifier; }43 uint64_t identifier() const final { return m_identifier; } 44 uint64_t messageSenderDestinationID() final { return m_identifier; } 45 45 46 46 // IDBConnectionToServerDelegate 47 void deleteDatabase(WebCore::IDBRequestData&) overridefinal;48 void openDatabase(WebCore::IDBRequestData&) overridefinal;49 void abortTransaction(WebCore::IDBResourceIdentifier&) overridefinal;50 void commitTransaction(WebCore::IDBResourceIdentifier&) overridefinal;51 void didFinishHandlingVersionChangeTransaction(WebCore::IDBResourceIdentifier&) overridefinal;52 void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&) overridefinal;53 void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName) overridefinal;54 void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier) overridefinal;55 void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&) overridefinal;56 void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) overridefinal;57 void putOrAdd(const WebCore::IDBRequestData&, WebCore::IDBKey*, WebCore::SerializedScriptValue&, const WebCore::IndexedDB::ObjectStoreOverwriteMode) overridefinal;58 void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) overridefinal;59 void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) overridefinal;60 void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) overridefinal;61 void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&) overridefinal;62 void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, unsigned long count) overridefinal;63 void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&) overridefinal;64 void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) overridefinal;65 void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier) overridefinal;66 void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier) overridefinal;47 void deleteDatabase(WebCore::IDBRequestData&) final; 48 void openDatabase(WebCore::IDBRequestData&) final; 49 void abortTransaction(WebCore::IDBResourceIdentifier&) final; 50 void commitTransaction(WebCore::IDBResourceIdentifier&) final; 51 void didFinishHandlingVersionChangeTransaction(WebCore::IDBResourceIdentifier&) final; 52 void createObjectStore(const WebCore::IDBRequestData&, const WebCore::IDBObjectStoreInfo&) final; 53 void deleteObjectStore(const WebCore::IDBRequestData&, const String& objectStoreName) final; 54 void clearObjectStore(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier) final; 55 void createIndex(const WebCore::IDBRequestData&, const WebCore::IDBIndexInfo&) final; 56 void deleteIndex(const WebCore::IDBRequestData&, uint64_t objectStoreIdentifier, const String& indexName) final; 57 void putOrAdd(const WebCore::IDBRequestData&, WebCore::IDBKey*, WebCore::SerializedScriptValue&, const WebCore::IndexedDB::ObjectStoreOverwriteMode) final; 58 void getRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final; 59 void getCount(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final; 60 void deleteRecord(const WebCore::IDBRequestData&, const WebCore::IDBKeyRangeData&) final; 61 void openCursor(const WebCore::IDBRequestData&, const WebCore::IDBCursorInfo&) final; 62 void iterateCursor(const WebCore::IDBRequestData&, const WebCore::IDBKeyData&, unsigned long count) final; 63 void establishTransaction(uint64_t databaseConnectionIdentifier, const WebCore::IDBTransactionInfo&) final; 64 void databaseConnectionClosed(uint64_t databaseConnectionIdentifier) final; 65 void abortOpenAndUpgradeNeeded(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& transactionIdentifier) final; 66 void didFireVersionChangeEvent(uint64_t databaseConnectionIdentifier, const WebCore::IDBResourceIdentifier& requestIdentifier) final; 67 67 68 68 void ref() override { RefCounted<WebIDBConnectionToServer>::ref(); } … … 94 94 WebIDBConnectionToServer(); 95 95 96 IPC::Connection* messageSenderConnection() overridefinal;96 IPC::Connection* messageSenderConnection() final; 97 97 98 98 uint64_t m_identifier; -
trunk/Source/WebKit2/WebProcess/Databases/WebDatabaseProvider.h
r197563 r197566 39 39 40 40 #if ENABLE(INDEXED_DATABASE) 41 WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const WebCore::SessionID&) overridefinal;41 WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const WebCore::SessionID&) final; 42 42 #endif 43 43 -
trunk/Tools/ChangeLog
r197563 r197566 1 2016-03-03 Darin Adler <darin@apple.com> 2 3 Followup to: 4 Remove "virtual" from all lines that have both "virtual" and "override". 5 https://bugs.webkit.org/show_bug.cgi?id=155005 6 7 Reviewed by Geoffrey Garen. 8 9 * Scripts/do-webcore-rename: Added more regular expressions to make sure we always 10 use either override or final, not both, and to remove virtual from all lines that 11 have both virtual and final. 12 1 13 2016-03-03 Darin Adler <darin@apple.com> 2 14 -
trunk/Tools/Scripts/do-webcore-rename
r197563 r197566 216 216 # Should be a no-op but also OK to remove this any time, now that we have done it once. 217 217 $newContents =~ s/^(\s*(\w+EXPORT\w*\s+)?)virtual ([^{;]+ override\b)/$1$3/mg; 218 $newContents =~ s/^(\s*(\w+EXPORT\w*\s+)?)virtual ([^{;]+ final\b)/$1$3/mg; 219 $newContents =~ s/\boverride\s+final\b/final/g; 220 $newContents =~ s/\bfinal\s+override\b/final/g; 218 221 219 222 if ($newContents ne $contents) { -
trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h
r182537 r197566 77 77 // Prohibit overrides because this is called when the web view is created 78 78 // in our constructor, before a derived class's vtable is ready. 79 void initializeWebExtensions() overridefinal { Test::initializeWebExtensions(); }79 void initializeWebExtensions() final { Test::initializeWebExtensions(); } 80 80 81 81 static gboolean webProcessCrashed(WebKitWebView*, WebViewTest*); -
trunk/Tools/WebKitTestRunner/UIScriptContext/UIScriptController.h
r195899 r197566 90 90 void platformClearAllCallbacks(); 91 91 92 virtual JSClassRef wrapperClass() override;92 JSClassRef wrapperClass() final; 93 93 94 94 JSObjectRef objectFromRect(const WKRect&) const;
Note: See TracChangeset
for help on using the changeset viewer.