Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
authorenrica@apple.com <enrica@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 17:20:03 +0000 (17:20 +0000)
committerenrica@apple.com <enrica@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 17:20:03 +0000 (17:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121464

Reviewed by Darin Adler.

Source/WebCore:

This method was only implemented in WebEditorClient.mm for Mac where it was
calling a private delegate that is no longer in use.
This patch removes it for all the platforms.
I've also removed setTypes and writeAfterSettingTypes from the implementation
of the Pasteboard class for Mac.

* editing/mac/EditorMac.mm:
(WebCore::Editor::writeSelectionToPasteboard): Now calls write instead of
setTypes and writeAfterSettingTypes.
* loader/EmptyClients.h: Removed didSetSelectionTypesForPasteboard.
* page/EditorClient.h: Ditto.
* platform/Pasteboard.h: Removed setTypes and writeAfterSettingTypes.
* platform/ios/PasteboardIOS.mm:
(WebCore::Pasteboard::writeSelection): Removed call to didSetSelectionTypesForPasteboard.
* platform/mac/PasteboardMac.mm:
(WebCore::Pasteboard::write): Added to replace setTypes and writeAfterSettingTypes.

Source/WebKit/efl:

* WebCoreSupport/EditorClientEfl.cpp:
* WebCoreSupport/EditorClientEfl.h:

Source/WebKit/gtk:

* WebCoreSupport/EditorClientGtk.cpp:
* WebCoreSupport/EditorClientGtk.h:

Source/WebKit/mac:

This method was only implemented in WebEditorClient.mm for Mac where it was
calling a private delegate that is no longer in use.

* DefaultDelegates/WebDefaultEditingDelegate.m:
* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:
* WebView/WebEditingDelegatePrivate.h:

Source/WebKit/qt:

* WebCoreSupport/EditorClientQt.cpp:
* WebCoreSupport/EditorClientQt.h:

Source/WebKit/win:

* WebCoreSupport/WebEditorClient.cpp:
* WebCoreSupport/WebEditorClient.h:

Source/WebKit/wince:

* WebCoreSupport/EditorClientWinCE.cpp:
* WebCoreSupport/EditorClientWinCE.h:

Source/WebKit2:

* WebProcess/WebCoreSupport/WebEditorClient.cpp:
* WebProcess/WebCoreSupport/WebEditorClient.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

31 files changed:
Source/WebCore/ChangeLog
Source/WebCore/editing/mac/EditorMac.mm
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/EditorClient.h
Source/WebCore/platform/Pasteboard.h
Source/WebCore/platform/ios/PasteboardIOS.mm
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebKit/blackberry/WebCoreSupport/EditorClientBlackBerry.h
Source/WebKit/efl/ChangeLog
Source/WebKit/efl/WebCoreSupport/EditorClientEfl.cpp
Source/WebKit/efl/WebCoreSupport/EditorClientEfl.h
Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp
Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m
Source/WebKit/mac/WebCoreSupport/WebEditorClient.h
Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm
Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h
Source/WebKit/qt/ChangeLog
Source/WebKit/qt/WebCoreSupport/EditorClientQt.cpp
Source/WebKit/qt/WebCoreSupport/EditorClientQt.h
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebEditorClient.cpp
Source/WebKit/win/WebCoreSupport/WebEditorClient.h
Source/WebKit/wince/ChangeLog
Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.cpp
Source/WebKit/wince/WebCoreSupport/EditorClientWinCE.h
Source/WebKit2/ChangeLog
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

index 5d40eec..32c2a20 100644 (file)
@@ -1,3 +1,27 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        This method was only implemented in WebEditorClient.mm for Mac where it was
+        calling a private delegate that is no longer in use.
+        This patch removes it for all the platforms.
+        I've also removed setTypes and writeAfterSettingTypes from the implementation
+        of the Pasteboard class for Mac.
+
+        * editing/mac/EditorMac.mm:
+        (WebCore::Editor::writeSelectionToPasteboard): Now calls write instead of
+        setTypes and writeAfterSettingTypes.
+        * loader/EmptyClients.h: Removed didSetSelectionTypesForPasteboard.
+        * page/EditorClient.h: Ditto.
+        * platform/Pasteboard.h: Removed setTypes and writeAfterSettingTypes.
+        * platform/ios/PasteboardIOS.mm:
+        (WebCore::Pasteboard::writeSelection): Removed call to didSetSelectionTypesForPasteboard.
+        * platform/mac/PasteboardMac.mm:
+        (WebCore::Pasteboard::write): Added to replace setTypes and writeAfterSettingTypes.
+
 2013-09-17  Darin Adler  <darin@apple.com>
 
         Further shrink table-populating code by making the tables read-only data and preventing inlining
index 069344a..c0f86ec 100644 (file)
@@ -354,9 +354,7 @@ void Editor::writeSelectionToPasteboard(Pasteboard& pasteboard)
     content.dataInStringFormat = stringSelectionForPasteboardWithImageAltText();
     client()->getClientPasteboardDataForRange(selectedRange().get(), content.clientTypes, content.clientData);
 
-    pasteboard.setTypes(content);
-    client()->didSetSelectionTypesForPasteboard();
-    pasteboard.writeAfterSettingTypes(content);
+    pasteboard.write(content);
 }
 
 static void getImage(Element& imageElement, RefPtr<Image>& image, CachedImage*& cachedImage)
index 80af90b..919ca84 100644 (file)
@@ -426,7 +426,6 @@ public:
     virtual void willWriteSelectionToPasteboard(Range*) { }
     virtual void didWriteSelectionToPasteboard() { }
     virtual void getClientPasteboardDataForRange(Range*, Vector<String>&, Vector<RefPtr<SharedBuffer> >&) { }
-    virtual void didSetSelectionTypesForPasteboard() { }
 
     virtual void registerUndoStep(PassRefPtr<UndoStep>) OVERRIDE;
     virtual void registerRedoStep(PassRefPtr<UndoStep>) OVERRIDE;
index 739bc3a..385766e 100644 (file)
@@ -90,7 +90,6 @@ public:
     virtual void willWriteSelectionToPasteboard(Range*) = 0;
     virtual void didWriteSelectionToPasteboard() = 0;
     virtual void getClientPasteboardDataForRange(Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<SharedBuffer> >& pasteboardData) = 0;
-    virtual void didSetSelectionTypesForPasteboard() = 0;
     
     virtual void registerUndoStep(PassRefPtr<UndoStep>) = 0;
     virtual void registerRedoStep(PassRefPtr<UndoStep>) = 0;
index 5d98a45..c480f04 100644 (file)
@@ -145,11 +145,6 @@ public:
     void write(const PasteboardImage&);
     void write(const PasteboardWebContent&);
 
-    // FIXME: These two functions called one after the other are the same as calling write. It would be nice if these two separate functions
-    // could be eliminated, however Mac supports an editor client call that happens after setting the types but before writing to the pasteboard.
-    void setTypes(const PasteboardWebContent&);
-    void writeAfterSettingTypes(const PasteboardWebContent&);
-
     Vector<String> readFilenames();
     bool canSmartReplace();
 
index f9b3d29..984eb19 100644 (file)
@@ -136,8 +136,6 @@ void Pasteboard::writeSelection(Range* selectedRange, bool /*canSmartCopyOrDelet
     if (enclosingAnchor && comparePositions(firstPositionInOrBeforeNode(selectedRange->startPosition().anchorNode()), selectedRange->startPosition()) >= 0)
         selectedRange->setStart(enclosingAnchor, 0, ec);
 
-    frame->editor().client()->didSetSelectionTypesForPasteboard();
-
     RetainPtr<NSDictionary> representations = adoptNS([[NSMutableDictionary alloc] init]);
 
     // Put WebArchive on the pasteboard.
index b42bcc3..e7ad6a1 100644 (file)
@@ -138,7 +138,7 @@ void Pasteboard::clear()
     m_changeCount = platformStrategies()->pasteboardStrategy()->setTypes(Vector<String>(), m_pasteboardName);
 }
 
-void Pasteboard::setTypes(const PasteboardWebContent& content)
+void Pasteboard::write(const PasteboardWebContent& content)
 {
     Vector<String> types;
 
@@ -155,10 +155,7 @@ void Pasteboard::setTypes(const PasteboardWebContent& content)
     types.appendVector(content.clientTypes);
 
     m_changeCount = platformStrategies()->pasteboardStrategy()->setTypes(types, m_pasteboardName);
-}
 
-void Pasteboard::writeAfterSettingTypes(const PasteboardWebContent& content)
-{
     ASSERT(content.clientTypes.size() == content.clientData.size());
     for (size_t i = 0, size = content.clientTypes.size(); i < size; ++i)
         m_changeCount = platformStrategies()->pasteboardStrategy()->setBufferForType(content.clientData[i], content.clientTypes[i], m_pasteboardName);
index 09c79f1..784f26a 100644 (file)
@@ -60,7 +60,6 @@ public:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*);
     virtual void didWriteSelectionToPasteboard();
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-    virtual void didSetSelectionTypesForPasteboard();
     virtual void registerUndoStep(PassRefPtr<UndoStep>);
     virtual void registerRedoStep(PassRefPtr<UndoStep>);
     virtual void clearUndoRedoOperations();
index 674e0e9..5ed985a 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/EditorClientEfl.cpp:
+        * WebCoreSupport/EditorClientEfl.h:
+
 2013-09-12  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 
         Remove home-brewed nullptr
index 74453c2..0f97f5e 100644 (file)
@@ -169,11 +169,6 @@ void EditorClientEfl::getClientPasteboardDataForRange(WebCore::Range*, Vector<St
 {
 }
 
-void EditorClientEfl::didSetSelectionTypesForPasteboard()
-{
-    notImplemented();
-}
-
 void EditorClientEfl::registerUndoStep(WTF::PassRefPtr<UndoStep> step)
 {
     if (!m_isInRedo)
index 7bd3ab0..afe1732 100644 (file)
@@ -107,7 +107,6 @@ public:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*);
     virtual void didWriteSelectionToPasteboard();
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-    virtual void didSetSelectionTypesForPasteboard();
 
     virtual void registerUndoStep(WTF::PassRefPtr<UndoStep>);
     virtual void registerRedoStep(WTF::PassRefPtr<UndoStep>);
index 4a81cc6..314ee05 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/EditorClientGtk.cpp:
+        * WebCoreSupport/EditorClientGtk.h:
+
 2013-09-16  Gustavo Noronha Silva  <gns@gnome.org>
 
         [GTK] Make symbol export filter more strict, and disable for dev/test builds
index 72fa811..f1261d8 100644 (file)
@@ -276,11 +276,6 @@ void EditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<Strin
 {
 }
 
-void EditorClient::didSetSelectionTypesForPasteboard()
-{
-    notImplemented();
-}
-
 void EditorClient::registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep> step)
 {
     if (undoStack.size() == maximumUndoStackDepth)
index 68f12e5..c52ebbc 100644 (file)
@@ -98,7 +98,6 @@ class EditorClient : public WebCore::EditorClient {
         virtual void willWriteSelectionToPasteboard(WebCore::Range*);
         virtual void didWriteSelectionToPasteboard();
         virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-        virtual void didSetSelectionTypesForPasteboard();
 
         virtual void registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep>);
         virtual void registerRedoStep(WTF::PassRefPtr<WebCore::UndoStep>);
index 8891d5f..fcd6143 100644 (file)
@@ -1,3 +1,18 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        This method was only implemented in WebEditorClient.mm for Mac where it was
+        calling a private delegate that is no longer in use.
+
+        * DefaultDelegates/WebDefaultEditingDelegate.m:
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebEditorClient.mm:
+        * WebView/WebEditingDelegatePrivate.h:
+
 2013-09-13  Anders Carlsson  <andersca@apple.com>
 
         Use nullptr instead of 0 in calls to HashMap::add
index bf7ee17..f850dd6 100644 (file)
@@ -106,10 +106,6 @@ static WebDefaultEditingDelegate *sharedDelegate = nil;
 {
 }
 
-- (void)webView:(WebView *)webView didSetSelectionTypesForPasteboard:(NSPasteboard *)pasteboard
-{
-}
-
 - (void)webViewDidBeginEditing:(NSNotification *)notification
 {
 }
index e03383d..e711a44 100644 (file)
@@ -68,7 +68,6 @@ public:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*) OVERRIDE;
     virtual void didWriteSelectionToPasteboard() OVERRIDE;
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData) OVERRIDE;
-    virtual void didSetSelectionTypesForPasteboard() OVERRIDE;
 
     virtual NSString* userVisibleString(NSURL *) OVERRIDE;
     virtual WebCore::DocumentFragment* documentFragmentFromAttributedString(NSAttributedString *, Vector< RefPtr<WebCore::ArchiveResource> >&) OVERRIDE;
index 2897a15..5cd1608 100644 (file)
@@ -331,11 +331,6 @@ void WebEditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<St
     // Not implemented WebKit, only WebKit2.
 }
 
-void WebEditorClient::didSetSelectionTypesForPasteboard()
-{
-    [[m_webView _editingDelegateForwarder] webView:m_webView didSetSelectionTypesForPasteboard:[NSPasteboard generalPasteboard]];
-}
-
 NSString *WebEditorClient::userVisibleString(NSURL *URL)
 {
     return [URL _web_userVisibleString];
index 1116de3..d926b93 100644 (file)
@@ -33,6 +33,5 @@
 @interface NSObject (WebViewEditingDelegatePrivate)
 - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element;
 - (void)webView:(WebView *)webView didWriteSelectionToPasteboard:(NSPasteboard *)pasteboard;
-- (void)webView:(WebView *)webView didSetSelectionTypesForPasteboard:(NSPasteboard *)pasteboard;
 - (BOOL)webView:(WebView *)webView shouldMoveRangeAfterDelete:(DOMRange *)range replacingRange:(DOMRange *)rangeToBeReplaced;
 @end
index 1ea1737..8f27f90 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        * WebCoreSupport/EditorClientQt.h:
+
 2013-09-12  Andreas Kling  <akling@apple.com>
 
         Fix Qt build.
index 96c2324..29b4395 100644 (file)
@@ -230,10 +230,6 @@ void EditorClientQt::getClientPasteboardDataForRange(Range*, Vector<String>&, Ve
 {
 }
 
-void EditorClientQt::didSetSelectionTypesForPasteboard()
-{
-}
-
 bool EditorClientQt::selectWordBeforeMenuEvent()
 {
     notImplemented();
index e38a647..e3aecef 100644 (file)
@@ -74,7 +74,6 @@ public:
     virtual void willWriteSelectionToPasteboard(Range*);
     virtual void didWriteSelectionToPasteboard();
     virtual void getClientPasteboardDataForRange(Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-    virtual void didSetSelectionTypesForPasteboard();
     
     virtual void registerUndoStep(PassRefPtr<UndoStep>);
     virtual void registerRedoStep(PassRefPtr<UndoStep>);
index 642fcfc..371586e 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/WebEditorClient.cpp:
+        * WebCoreSupport/WebEditorClient.h:
+
 2013-09-16  Brent Fulgham  <bfulgham@apple.com>
 
         [Windows] Rendering stops when mouse is moving for some types of animations.
index fd64874..22f662d 100644 (file)
@@ -239,11 +239,6 @@ void WebEditorClient::getClientPasteboardDataForRange(WebCore::Range*, Vector<St
     notImplemented();
 }
 
-void WebEditorClient::didSetSelectionTypesForPasteboard()
-{
-    notImplemented();
-}
-
 bool WebEditorClient::shouldDeleteRange(Range* /*range*/)
 {
     notImplemented(); 
index 8bc1fde..55ba516 100644 (file)
@@ -57,7 +57,6 @@ public:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*);
     virtual void didWriteSelectionToPasteboard();
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-    virtual void didSetSelectionTypesForPasteboard();
 
     virtual void respondToChangedContents();
     virtual void respondToChangedSelection(WebCore::Frame*);
index 3e0a6a8..e58bd8f 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebCoreSupport/EditorClientWinCE.cpp:
+        * WebCoreSupport/EditorClientWinCE.h:
+
 2013-08-24  Darin Adler  <darin@apple.com>
 
         Frame::tree should return a reference instead of a pointer
index a2b9618..619bf97 100644 (file)
@@ -148,11 +148,6 @@ void EditorClientWinCE::getClientPasteboardDataForRange(WebCore::Range*, Vector<
     notImplemented();
 }
 
-void EditorClientWinCE::didSetSelectionTypesForPasteboard()
-{
-    notImplemented();
-}
-
 void EditorClientWinCE::registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep>)
 {
     notImplemented();
index 9cacaf5..9d32ea6 100644 (file)
@@ -64,7 +64,6 @@ public:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*);
     virtual void didWriteSelectionToPasteboard();
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer> >& pasteboardData);
-    virtual void didSetSelectionTypesForPasteboard();
 
     virtual void registerUndoStep(WTF::PassRefPtr<WebCore::UndoStep>);
     virtual void registerRedoStep(WTF::PassRefPtr<WebCore::UndoStep>);
index 9e60771..f35b824 100644 (file)
@@ -1,3 +1,13 @@
+2013-09-16  Enrica Casucci  <enrica@apple.com>
+
+        Remove unused function didSetSelectionTypesForPasteboard from EditorClient.
+        https://bugs.webkit.org/show_bug.cgi?id=121464
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        * WebProcess/WebCoreSupport/WebEditorClient.h:
+
 2013-09-17  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Buildfix for !(ENABLE(WEB_ARCHIVE) || ENABLE(MHTML)) platforms
index 5d071e1..d65cb24 100644 (file)
@@ -235,11 +235,6 @@ void WebEditorClient::getClientPasteboardDataForRange(Range* range, Vector<Strin
     m_page->injectedBundleEditorClient().getPasteboardDataForRange(m_page, range, pasteboardTypes, pasteboardData);
 }
 
-void WebEditorClient::didSetSelectionTypesForPasteboard()
-{
-    notImplemented();
-}
-
 void WebEditorClient::registerUndoStep(PassRefPtr<UndoStep> step)
 {
     // FIXME: Add assertion that the command being reapplied is the same command that is
index 494280c..e4aeafe 100644 (file)
@@ -68,7 +68,6 @@ private:
     virtual void willWriteSelectionToPasteboard(WebCore::Range*) OVERRIDE;
     virtual void didWriteSelectionToPasteboard() OVERRIDE;
     virtual void getClientPasteboardDataForRange(WebCore::Range*, Vector<String>& pasteboardTypes, Vector<RefPtr<WebCore::SharedBuffer>>& pasteboardData) OVERRIDE;
-    virtual void didSetSelectionTypesForPasteboard() OVERRIDE;
     
     virtual void registerUndoStep(PassRefPtr<WebCore::UndoStep>) OVERRIDE;
     virtual void registerRedoStep(PassRefPtr<WebCore::UndoStep>) OVERRIDE;