Changeset 175647 in webkit


Ignore:
Timestamp:
Nov 5, 2014 4:09:49 PM (9 years ago)
Author:
mitz@apple.com
Message:

Remove the unused deletion UI feature
​https://bugs.webkit.org/show_bug.cgi?id=138442

Rubber-stamped by Alexey Proskuryakov.

Source/WebCore:

  • WebCore.xcodeproj/project.pbxproj: Removed references to removed files.
  • dom/ContainerNode.cpp:

(WebCore::ContainerNode::cloneChildNodes): Folded the below helper function into this member
function, after removing the deleteButtonContainerElement parameter.
(WebCore::cloneChildNodesAvoidingDeleteButton): Deleted.

  • editing/CompositeEditCommand.cpp:

(WebCore::EditCommandComposition::unapply): Removed use of
DeleteButtonControllerDisableScope.
(WebCore::EditCommandComposition::reapply): Ditto.
(WebCore::CompositeEditCommand::apply): Ditto.

  • editing/DeleteButton.cpp: Removed.
  • editing/DeleteButton.h: Removed.
  • editing/DeleteButtonController.cpp: Removed.
  • editing/DeleteButtonController.h: Removed.
  • editing/EditCommand.cpp:

(WebCore::EditCommand::EditCommand): Removed use of
Editor::avoidIntersectionWithDeleteButtonController.

  • editing/Editor.cpp:

(WebCore::Editor::Editor): Removed initialization of m_deleteButtonController.
(WebCore::Editor::rangeForPoint): Removed use of avoidIntersectionWithDeleteButtonController.
(WebCore::Editor::editorUIUpdateTimerFired): Removed call to DeleteButtonController function.
(WebCore::Editor::avoidIntersectionWithDeleteButtonController): Deleted.
(WebCore::Editor::deviceScaleFactorChanged): Deleted.

  • editing/Editor.h:

(WebCore::Editor::deleteButtonController): Deleted.
(WebCore::Editor::avoidIntersectionWithDeleteButtonController): Deleted.

  • editing/MarkupAccumulator.cpp:

(WebCore::MarkupAccumulator::serializeNodes): Removed nodeToSkip parameter.
(WebCore::MarkupAccumulator::serializeNodesWithNamespaces): Ditto.

  • editing/MarkupAccumulator.h:
  • editing/markup.cpp:

(WebCore::createMarkupInternal): Removed updateRange parameter, which had become identical
to the range parameter, and changed to use the latter everywhere instead.
(WebCore::createMarkup): Don’t compute and pass separate updateRanage parameter.

  • loader/EmptyClients.h: Removed shouldShowDeleteInterface override.
  • page/EditorClient.h: Removed shouldShowDeleteInterface.
  • page/Page.cpp:

(WebCore::Page::setDeviceScaleFactor): Removed call to Editor::deviceScaleFactorChanged.

  • page/PageSerializer.cpp:

(WebCore::PageSerializer::serializeFrame): Updated for MarkupAccumulator::serializeNodes change.

  • testing/Internals.cpp:

(WebCore::Internals::findEditingDeleteButton): Deleted.

  • testing/Internals.h:
  • testing/Internals.idl:

Source/WebKit/mac:

  • DefaultDelegates/WebDefaultEditingDelegate.m:

(-[WebDefaultEditingDelegate webView:shouldShowDeleteInterfaceForElement:]): Deleted.

  • WebCoreSupport/WebEditorClient.h:
  • WebCoreSupport/WebEditorClient.mm:

(WebEditorClient::shouldShowDeleteInterface): Deleted.

  • WebView/WebEditingDelegatePrivate.h: Removed declaration of

-webView:shouldShowDeleteInterfaceForElement:.

Source/WebKit2:

  • WebProcess/WebCoreSupport/WebEditorClient.cpp:

(WebKit::WebEditorClient::shouldShowDeleteInterface): Deleted.

  • WebProcess/WebCoreSupport/WebEditorClient.h:

Source/WTF:

  • wtf/FeatureDefines.h: Removed definition of ENABLE_DELETION_UI.

Tools:

  • DumpRenderTree/mac/EditingDelegate.mm:

(-[EditingDelegate webView:shouldShowDeleteInterfaceForElement:]): Deleted implementation of
delegate method that’s been removed.

LayoutTests:

Removed tests, expected results, and support files for this feature.

  • platform/mac/editing/deleting/deletionUI-borders-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-borders.html: Removed.
  • platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-click-on-delete-button.html: Removed.
  • platform/mac/editing/deleting/deletionUI-differing-background-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-differing-background.html: Removed.
  • platform/mac/editing/deleting/deletionUI-minimum-size-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-minimum-size.html: Removed.
  • platform/mac/editing/deleting/deletionUI-single-instance-expected.png: Removed.
  • platform/mac/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-single-instance.html: Removed.
  • platform/mac/editing/deleting/deletionUI-successful-deletion-expected.txt: Removed.
  • platform/mac/editing/deleting/deletionUI-successful-deletion.html: Removed.
  • platform/mac/editing/deleting/id-in-deletebutton-expected.txt: Removed.
  • platform/mac/editing/deleting/id-in-deletebutton.html: Removed.
  • platform/mac/editing/deleting/resources: Removed.
  • platform/mac/editing/deleting/resources/deletionUI-helpers.js: Removed.
  • platform/wk2/TestExpectations:
Location:
trunk
Files:
25 deleted
31 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r175641 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        Removed tests, expected results, and support files for this feature.
     9
     10        * platform/mac/editing/deleting/deletionUI-borders-expected.txt: Removed.
     11        * platform/mac/editing/deleting/deletionUI-borders.html: Removed.
     12        * platform/mac/editing/deleting/deletionUI-click-on-delete-button-expected.txt: Removed.
     13        * platform/mac/editing/deleting/deletionUI-click-on-delete-button.html: Removed.
     14        * platform/mac/editing/deleting/deletionUI-differing-background-expected.txt: Removed.
     15        * platform/mac/editing/deleting/deletionUI-differing-background.html: Removed.
     16        * platform/mac/editing/deleting/deletionUI-minimum-size-expected.txt: Removed.
     17        * platform/mac/editing/deleting/deletionUI-minimum-size.html: Removed.
     18        * platform/mac/editing/deleting/deletionUI-single-instance-expected.png: Removed.
     19        * platform/mac/editing/deleting/deletionUI-single-instance-expected.txt: Removed.
     20        * platform/mac/editing/deleting/deletionUI-single-instance.html: Removed.
     21        * platform/mac/editing/deleting/deletionUI-successful-deletion-expected.txt: Removed.
     22        * platform/mac/editing/deleting/deletionUI-successful-deletion.html: Removed.
     23        * platform/mac/editing/deleting/id-in-deletebutton-expected.txt: Removed.
     24        * platform/mac/editing/deleting/id-in-deletebutton.html: Removed.
     25        * platform/mac/editing/deleting/resources: Removed.
     26        * platform/mac/editing/deleting/resources/deletionUI-helpers.js: Removed.
     27        * platform/wk2/TestExpectations:
     28
    1292014-11-04  David Hyatt  <hyatt@apple.com>
    230

  • trunk/LayoutTests/platform/wk2/TestExpectations

    r174536 r175647  
    123123platform/mac/fast/text/attributed-substring-from-range.html
    124124platform/mac/fast/text/justified-text-rect.html
    125 
    126 # WebKitTestRunner needs to support needsDeletionUI mechanism to show deletion UI
    127 # <https://bugs.webkit.org/show_bug.cgi?id=42535>
    128 platform/mac/editing/deleting/id-in-deletebutton.html
    129 platform/mac/editing/deleting/deletionUI-click-on-delete-button.html
    130 platform/mac/editing/deleting/deletionUI-single-instance.html
    131 platform/mac/editing/deleting/deletionUI-borders.html
    132 platform/mac/editing/deleting/deletionUI-differing-background.html
    133 platform/mac/editing/deleting/deletionUI-minimum-size.html
    134 platform/mac/editing/deleting/deletionUI-successful-deletion.html
    135125
    136126# WebKitTestRunner needs layoutTestController.setDashboardCompatibilityMode

  • trunk/Source/WTF/ChangeLog

    r175626 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        * wtf/FeatureDefines.h: Removed definition of ENABLE_DELETION_UI.
     9
    1102014-11-03  Dean Jackson  <dino@apple.com>
    211

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r175626 r175647  
    176176#endif
    177177
    178 #if !defined(ENABLE_DELETION_UI)
    179 #define ENABLE_DELETION_UI 1
    180 #endif
    181 
    182178#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
    183179#if !defined(ENABLE_ENCRYPTED_MEDIA)
    … …  
    390386#endif
    391387
    392 #if !defined(ENABLE_DELETION_UI)
    393 #define ENABLE_DELETION_UI 0
    394 #endif
    395 
    396388#if !defined(ENABLE_DETAILS_ELEMENT)
    397389#define ENABLE_DETAILS_ELEMENT 1

  • trunk/Source/WebCore/ChangeLog

    r175641 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        * Resources/deleteButton.png: Removed.
     9        * Resources/deleteButton@2x.png: Removed.
     10        * Resources/deleteButtonPressed.png: Removed.
     11        * Resources/deleteButtonPressed@2x.png: Removed.
     12
     13        * WebCore.xcodeproj/project.pbxproj: Removed references to removed files.
     14
     15        * dom/ContainerNode.cpp:
     16        (WebCore::ContainerNode::cloneChildNodes): Folded the below helper function into this member
     17        function, after removing the deleteButtonContainerElement parameter.
     18        (WebCore::cloneChildNodesAvoidingDeleteButton): Deleted.
     19
     20        * editing/CompositeEditCommand.cpp:
     21        (WebCore::EditCommandComposition::unapply): Removed use of
     22        DeleteButtonControllerDisableScope.
     23        (WebCore::EditCommandComposition::reapply): Ditto.
     24        (WebCore::CompositeEditCommand::apply): Ditto.
     25
     26        * editing/DeleteButton.cpp: Removed.
     27        * editing/DeleteButton.h: Removed.
     28        * editing/DeleteButtonController.cpp: Removed.
     29        * editing/DeleteButtonController.h: Removed.
     30
     31        * editing/EditCommand.cpp:
     32        (WebCore::EditCommand::EditCommand): Removed use of
     33        Editor::avoidIntersectionWithDeleteButtonController.
     34
     35        * editing/Editor.cpp:
     36        (WebCore::Editor::Editor): Removed initialization of m_deleteButtonController.
     37        (WebCore::Editor::rangeForPoint): Removed use of avoidIntersectionWithDeleteButtonController.
     38        (WebCore::Editor::editorUIUpdateTimerFired): Removed call to DeleteButtonController function.
     39        (WebCore::Editor::avoidIntersectionWithDeleteButtonController): Deleted.
     40        (WebCore::Editor::deviceScaleFactorChanged): Deleted.
     41
     42        * editing/Editor.h:
     43        (WebCore::Editor::deleteButtonController): Deleted.
     44        (WebCore::Editor::avoidIntersectionWithDeleteButtonController): Deleted.
     45
     46        * editing/MarkupAccumulator.cpp:
     47        (WebCore::MarkupAccumulator::serializeNodes): Removed nodeToSkip parameter.
     48        (WebCore::MarkupAccumulator::serializeNodesWithNamespaces): Ditto.
     49
     50        * editing/MarkupAccumulator.h:
     51
     52        * editing/markup.cpp:
     53        (WebCore::createMarkupInternal): Removed updateRange parameter, which had become identical
     54        to the range parameter, and changed to use the latter everywhere instead.
     55        (WebCore::createMarkup): Don’t compute and pass separate updateRanage parameter.
     56
     57        * loader/EmptyClients.h: Removed shouldShowDeleteInterface override.
     58        * page/EditorClient.h: Removed shouldShowDeleteInterface.
     59
     60        * page/Page.cpp:
     61        (WebCore::Page::setDeviceScaleFactor): Removed call to Editor::deviceScaleFactorChanged.
     62
     63        * page/PageSerializer.cpp:
     64        (WebCore::PageSerializer::serializeFrame): Updated for MarkupAccumulator::serializeNodes change.
     65
     66        * testing/Internals.cpp:
     67        (WebCore::Internals::findEditingDeleteButton): Deleted.
     68        * testing/Internals.h:
     69        * testing/Internals.idl:
     70
    1712014-11-04  David Hyatt  <hyatt@apple.com>
    272

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r175549 r175647  
    957957                1C26497A0D7E248A00BD10F2 /* DocumentLoaderMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */; };
    958958                1C26497C0D7E24EC00BD10F2 /* PageMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */; };
    959                 1C4C8F020AD85D87009475CE /* DeleteButtonController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4C8F000AD85D87009475CE /* DeleteButtonController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    960                 1C4C8F660AD8655D009475CE /* DeleteButton.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C4C8F640AD8655D009475CE /* DeleteButton.h */; };
    961959                1C81B95A0E97330800266E07 /* InspectorController.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C81B9560E97330800266E07 /* InspectorController.h */; settings = {ATTRIBUTES = (Private, ); }; };
    962960                1C81B95B0E97330800266E07 /* InspectorController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C81B9570E97330800266E07 /* InspectorController.cpp */; };
    … …  
    974972                1CCDF5BD1990332400BCEBAD /* SVGToOTFFontConversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1CCDF5BB1990332400BCEBAD /* SVGToOTFFontConversion.cpp */; };
    975973                1CCDF5BE1990332400BCEBAD /* SVGToOTFFontConversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CCDF5BC1990332400BCEBAD /* SVGToOTFFontConversion.h */; };
    976                 1CE83AC30ADAFFD7009354F6 /* DeleteButtonController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */; };
    977                 1CE83AC40ADAFFD8009354F6 /* DeleteButton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C4C8F630AD8655D009475CE /* DeleteButton.cpp */; };
    978974                1CF6BDFA0E9BB26A0025E1CD /* ObjCEventListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CF6BDF80E9BB26A0025E1CD /* ObjCEventListener.h */; };
    979975                1CF6BDFB0E9BB26A0025E1CD /* ObjCEventListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1CF6BDF90E9BB26A0025E1CD /* ObjCEventListener.mm */; };
    … …  
    31513147                930C90DD19CF965300D6C21A /* InlineIterator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 930C90DC19CF965300D6C21A /* InlineIterator.cpp */; };
    31523148                930FC68A1072B9280045293E /* TextRenderingMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 930FC6891072B9280045293E /* TextRenderingMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
    3153                 93153BCD1417FBBF00FCF5BE /* deleteButton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BCC1417FBBF00FCF5BE /* deleteButton@2x.png */; };
    3154                 93153BCF1417FBDB00FCF5BE /* deleteButtonPressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BCE1417FBDB00FCF5BE /* deleteButtonPressed@2x.png */; };
    31553149                93153BDA14181F7A00FCF5BE /* missingImage@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BD914181F7A00FCF5BE /* missingImage@2x.png */; };
    31563150                93153BDC141959BC00FCF5BE /* textAreaResizeCorner.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */; };
    3157                 93153BDE141959F400FCF5BE /* deleteButton.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BDD141959F400FCF5BE /* deleteButton.png */; };
    3158                 93153BE014195A2800FCF5BE /* deleteButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BDF14195A2800FCF5BE /* deleteButtonPressed.png */; };
    31593151                93153BE214195A5700FCF5BE /* missingImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 93153BE114195A5700FCF5BE /* missingImage.png */; };
    31603152                931BCC611124DFCB00BE70DD /* MediaCanStartListener.h in Headers */ = {isa = PBXBuildFile; fileRef = 931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    79547946                1C2649790D7E248A00BD10F2 /* DocumentLoaderMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DocumentLoaderMac.cpp; sourceTree = "<group>"; };
    79557947                1C26497B0D7E24EC00BD10F2 /* PageMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageMac.cpp; sourceTree = "<group>"; };
    7956                 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButtonController.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    7957                 1C4C8F000AD85D87009475CE /* DeleteButtonController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButtonController.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    7958                 1C4C8F630AD8655D009475CE /* DeleteButton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeleteButton.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    7959                 1C4C8F640AD8655D009475CE /* DeleteButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeleteButton.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    79607948                1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreTextSPI.h; sourceTree = "<group>"; };
    79617949                1C81B9560E97330800266E07 /* InspectorController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorController.h; sourceTree = "<group>"; };
    … …  
    1031110299                930C90DC19CF965300D6C21A /* InlineIterator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InlineIterator.cpp; sourceTree = "<group>"; };
    1031210300                930FC6891072B9280045293E /* TextRenderingMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextRenderingMode.h; sourceTree = "<group>"; };
    10313                 93153BCC1417FBBF00FCF5BE /* deleteButton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "deleteButton@2x.png"; sourceTree = "<group>"; };
    10314                 93153BCE1417FBDB00FCF5BE /* deleteButtonPressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "deleteButtonPressed@2x.png"; sourceTree = "<group>"; };
    1031510301                93153BD914181F7A00FCF5BE /* missingImage@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "missingImage@2x.png"; sourceTree = "<group>"; };
    1031610302                93153BDB141959BB00FCF5BE /* textAreaResizeCorner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = textAreaResizeCorner.png; sourceTree = "<group>"; };
    10317                 93153BDD141959F400FCF5BE /* deleteButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = deleteButton.png; sourceTree = "<group>"; };
    10318                 93153BDF14195A2800FCF5BE /* deleteButtonPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = deleteButtonPressed.png; sourceTree = "<group>"; };
    1031910303                93153BE114195A5700FCF5BE /* missingImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = missingImage.png; sourceTree = "<group>"; };
    1032010304                931BCC601124DFCB00BE70DD /* MediaCanStartListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaCanStartListener.h; sourceTree = "<group>"; };
    … …  
    1488514869                                46F9D5DA0B0D60170028EE36 /* aliasCursor.png */,
    1488614870                                46D4F2460AF97E810035385A /* cellCursor.png */,
    14887                                 93153BDD141959F400FCF5BE /* deleteButton.png */,
    14888                                 93153BCC1417FBBF00FCF5BE /* deleteButton@2x.png */,
    14889                                 93153BDF14195A2800FCF5BE /* deleteButtonPressed.png */,
    14890                                 93153BCE1417FBDB00FCF5BE /* deleteButtonPressed@2x.png */,
    1489114871                                85136C890AED665800F90A3D /* eastResizeCursor.png */,
    1489214872                                85136C8A0AED665800F90A3D /* eastWestResizeCursor.png */,
    … …  
    1746317443                                D0B0556709C6700100307E43 /* CreateLinkCommand.cpp */,
    1746417444                                D0B0556609C6700100307E43 /* CreateLinkCommand.h */,
    17465                                 1C4C8F630AD8655D009475CE /* DeleteButton.cpp */,
    17466                                 1C4C8F640AD8655D009475CE /* DeleteButton.h */,
    17467                                 1C4C8EFF0AD85D87009475CE /* DeleteButtonController.cpp */,
    17468                                 1C4C8F000AD85D87009475CE /* DeleteButtonController.h */,
    1746917445                                93309D8F099E64910056E581 /* DeleteFromTextNodeCommand.cpp */,
    1747017446                                93309D90099E64910056E581 /* DeleteFromTextNodeCommand.h */,
    … …  
    2383223808                                FD31602E12B0267600C1A359 /* DelayNode.h in Headers */,
    2383323809                                FD31603112B0267600C1A359 /* DelayProcessor.h in Headers */,
    23834                                 1C4C8F660AD8655D009475CE /* DeleteButton.h in Headers */,
    23835                                 1C4C8F020AD85D87009475CE /* DeleteButtonController.h in Headers */,
    2383623810                                93309DDF099E64920056E581 /* DeleteFromTextNodeCommand.h in Headers */,
    2383723811                                93309DE1099E64920056E581 /* DeleteSelectionCommand.h in Headers */,
    … …  
    2695726931                                1C2417BA1992C04100EF9938 /* SpellingDot@3x.png in Resources */,
    2695826932                                46D4F2490AF97E810035385A /* cellCursor.png in Resources */,
    26959                                 93153BDE141959F400FCF5BE /* deleteButton.png in Resources */,
    26960                                 93153BCD1417FBBF00FCF5BE /* deleteButton@2x.png in Resources */,
    26961                                 93153BE014195A2800FCF5BE /* deleteButtonPressed.png in Resources */,
    26962                                 93153BCF1417FBDB00FCF5BE /* deleteButtonPressed@2x.png in Resources */,
    2696326933                                D02B64B214089E56006EFA21 /* DictationPhraseWithAlternativesDot.png in Resources */,
    2696426934                                D02B64B314089E56006EFA21 /* DictationPhraseWithAlternativesDot@2x.png in Resources */,
    … …  
    2751527485                                FD31602D12B0267600C1A359 /* DelayNode.cpp in Sources */,
    2751627486                                FD31603012B0267600C1A359 /* DelayProcessor.cpp in Sources */,
    27517                                 1CE83AC40ADAFFD8009354F6 /* DeleteButton.cpp in Sources */,
    27518                                 1CE83AC30ADAFFD7009354F6 /* DeleteButtonController.cpp in Sources */,
    2751927487                                93309DDE099E64920056E581 /* DeleteFromTextNodeCommand.cpp in Sources */,
    2752027488                                93309DE0099E64920056E581 /* DeleteSelectionCommand.cpp in Sources */,

  • trunk/Source/WebCore/dom/ContainerNode.cpp

    r175583 r175647  
    5555#include <wtf/CurrentTime.h>
    5656
    57 #if ENABLE(DELETION_UI)
    58 #include "DeleteButtonController.h"
    59 #endif
    60 
    6157namespace WebCore {
    6258
    … …  
    770766}
    771767
    772 inline static void cloneChildNodesAvoidingDeleteButton(ContainerNode* parent, ContainerNode* clonedParent, HTMLElement* deleteButtonContainerElement)
     768void ContainerNode::cloneChildNodes(ContainerNode *clone)
    773769{
    774770    ExceptionCode ec = 0;
    775     for (Node* child = parent->firstChild(); child && !ec; child = child->nextSibling()) {
    776 
    777 #if ENABLE(DELETION_UI)
    778         if (child == deleteButtonContainerElement)
    779             continue;
    780 #else
    781         UNUSED_PARAM(deleteButtonContainerElement);
    782 #endif
    783 
     771    for (Node* child = firstChild(); child && !ec; child = child->nextSibling()) {
    784772        RefPtr<Node> clonedChild = child->cloneNode(false);
    785         clonedParent->appendChild(clonedChild, ec);
     773        clone->appendChild(clonedChild, ec);
    786774
    787775        if (!ec && is<ContainerNode>(child))
    788             cloneChildNodesAvoidingDeleteButton(downcast<ContainerNode>(child), downcast<ContainerNode>(clonedChild.get()), deleteButtonContainerElement);
    789     }
    790 }
    791 
    792 void ContainerNode::cloneChildNodes(ContainerNode *clone)
    793 {
    794 #if ENABLE(DELETION_UI)
    795     HTMLElement* deleteButtonContainerElement = 0;
    796     if (Frame* frame = document().frame())
    797         deleteButtonContainerElement = frame->editor().deleteButtonController().containerElement();
    798     cloneChildNodesAvoidingDeleteButton(this, clone, deleteButtonContainerElement);
    799 #else
    800     cloneChildNodesAvoidingDeleteButton(this, clone, 0);
    801 #endif
     776            downcast<ContainerNode>(child)->cloneChildNodes(downcast<ContainerNode>(clonedChild.get()));
     777    }
    802778}
    803779

  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r175583 r175647  
    7373#include "markup.h"
    7474
    75 #if ENABLE(DELETION_UI)
    76 #include "DeleteButtonController.h"
    77 #endif
    78 
    79 
    8075namespace WebCore {
    8176
    … …  
    117112#endif
    118113
    119     {
    120 #if ENABLE(DELETION_UI)
    121         DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame.get());
    122 #endif
    123 
    124         size_t size = m_commands.size();
    125         for (size_t i = size; i; --i)
    126             m_commands[i - 1]->doUnapply();
    127     }
     114    size_t size = m_commands.size();
     115    for (size_t i = size; i; --i)
     116        m_commands[i - 1]->doUnapply();
    128117
    129118    frame->editor().unappliedEditing(this);
    … …  
    141130    m_document->updateLayoutIgnorePendingStylesheets();
    142131
    143     {
    144 #if ENABLE(DELETION_UI)
    145         DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame.get());
    146 #endif
    147         size_t size = m_commands.size();
    148         for (size_t i = 0; i != size; ++i)
    149             m_commands[i]->doReapply();
    150     }
    151    
     132    size_t size = m_commands.size();
     133    for (size_t i = 0; i != size; ++i)
     134        m_commands[i]->doReapply();
     135
    152136    frame->editor().reappliedEditing(this);
    153137}
    … …  
    221205    {
    222206        EventQueueScope eventQueueScope;
    223 #if ENABLE(DELETION_UI)
    224         DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(&frame());
    225 #endif
    226207        doApply();
    227208    }

  • trunk/Source/WebCore/editing/EditCommand.cpp

    r165676 r175647  
    4343{
    4444    ASSERT(document.frame());
    45     setStartingSelection(m_document->frame()->editor().avoidIntersectionWithDeleteButtonController(m_document->frame()->selection().selection()));
     45    setStartingSelection(m_document->frame()->selection().selection());
    4646    setEndingSelection(m_startingSelection);
    4747}

  • trunk/Source/WebCore/editing/Editor.cpp

    r175583 r175647  
    9595#include <wtf/unicode/CharacterNames.h>
    9696
    97 #if ENABLE(DELETION_UI)
    98 #include "DeleteButtonController.h"
    99 #endif
    100 
    10197#if PLATFORM(IOS)
    10298#include "DictationCommandIOS.h"
    … …  
    148144using namespace WTF;
    149145using namespace Unicode;
    150 
    151 #if ENABLE(DELETION_UI)
    152 
    153 PassRefPtr<Range> Editor::avoidIntersectionWithDeleteButtonController(const Range* range) const
    154 {
    155     if (!range)
    156         return 0;
    157 
    158     Node* startContainer = range->startContainer();
    159     int startOffset = range->startOffset();
    160     Node* endContainer = range->endContainer();
    161     int endOffset = range->endOffset();
    162 
    163     if (!startContainer)
    164         return 0;
    165 
    166     ASSERT(endContainer);
    167 
    168     Element* element = m_deleteButtonController->containerElement();
    169     if (startContainer == element || startContainer->isDescendantOf(element)) {
    170         ASSERT(element->parentNode());
    171         startContainer = element->parentNode();
    172         startOffset = element->computeNodeIndex();
    173     }
    174     if (endContainer == element || endContainer->isDescendantOf(element)) {
    175         ASSERT(element->parentNode());
    176         endContainer = element->parentNode();
    177         endOffset = element->computeNodeIndex();
    178     }
    179 
    180     return Range::create(range->ownerDocument(), startContainer, startOffset, endContainer, endOffset);
    181 }
    182 
    183 VisibleSelection Editor::avoidIntersectionWithDeleteButtonController(const VisibleSelection& selection) const
    184 {
    185     if (selection.isNone())
    186         return selection;
    187 
    188     Element* element = m_deleteButtonController->containerElement();
    189     if (!element)
    190         return selection;
    191     VisibleSelection updatedSelection = selection;
    192 
    193     Position updatedBase = selection.base();
    194     updatePositionForNodeRemoval(updatedBase, element);
    195     if (updatedBase != selection.base())
    196         updatedSelection.setBase(updatedBase);
    197 
    198     Position updatedExtent = selection.extent();
    199     updatePositionForNodeRemoval(updatedExtent, element);
    200     if (updatedExtent != selection.extent())
    201         updatedSelection.setExtent(updatedExtent);
    202 
    203     return updatedSelection;
    204 }
    205 
    206 #endif
    207146
    208147// When an event handler has moved the selection outside of a text control
    … …  
    11281067Editor::Editor(Frame& frame)
    11291068    : m_frame(frame)
    1130 #if ENABLE(DELETION_UI)
    1131     , m_deleteButtonController(std::make_unique<DeleteButtonController>(frame))
    1132 #endif
    11331069    , m_ignoreCompositionSelectionChange(false)
    11341070    , m_shouldStartNewKillRingSequence(false)
    … …  
    11601096    m_shouldStyleWithCSS = false;
    11611097    m_defaultParagraphSeparator = EditorParagraphSeparatorIsDiv;
    1162 
    1163 #if ENABLE(DELETION_UI)
    1164     m_deleteButtonController = std::make_unique<DeleteButtonController>(m_frame);
    1165 #endif
    11661098}
    11671099
    … …  
    27862718    VisibleSelection selection(frame->visiblePositionForPoint(framePoint));
    27872719
    2788     return avoidIntersectionWithDeleteButtonController(selection.toNormalizedRange().get());
     2720    return selection.toNormalizedRange();
    27892721}
    27902722
    … …  
    35093441        document().markers().removeMarkers(DocumentMarker::Grammar);
    35103442
    3511 #if ENABLE(DELETION_UI)
    3512     m_deleteButtonController->respondToChangedSelection(oldSelection);
    3513 #endif
    35143443    if (!m_editorUIUpdateTimerWasTriggeredByDictation)
    35153444        m_alternativeTextController->respondToChangedSelection(oldSelection);
    … …  
    35933522}
    35943523
    3595 void Editor::deviceScaleFactorChanged()
    3596 {
    3597 #if ENABLE(DELETION_UI)
    3598     m_deleteButtonController->deviceScaleFactorChanged();
    3599 #endif
    3600 }
    3601 
    36023524bool Editor::unifiedTextCheckerEnabled() const
    36033525{

  • trunk/Source/WebCore/editing/Editor.h

    r174791 r175647  
    391391    WEBCORE_EXPORT void simplifyMarkup(Node* startNode, Node* endNode);
    392392
    393     void deviceScaleFactorChanged();
    394 
    395393    EditorParagraphSeparator defaultParagraphSeparator() const { return m_defaultParagraphSeparator; }
    396394    void setDefaultParagraphSeparator(EditorParagraphSeparator separator) { m_defaultParagraphSeparator = separator; }
    397395    Vector<String> dictationAlternativesForMarker(const DocumentMarker*);
    398396    void applyDictationAlternativelternative(const String& alternativeString);
    399 
    400     PassRefPtr<Range> avoidIntersectionWithDeleteButtonController(const Range*) const;
    401     VisibleSelection avoidIntersectionWithDeleteButtonController(const VisibleSelection&) const;
    402397
    403398#if USE(APPKIT)
    … …  
    421416    WEBCORE_EXPORT bool isAutomaticSpellingCorrectionEnabled();
    422417    WEBCORE_EXPORT void toggleAutomaticSpellingCorrection();
    423 #endif
    424 
    425 #if ENABLE(DELETION_UI)
    426     DeleteButtonController& deleteButtonController() const { return *m_deleteButtonController; }
    427418#endif
    428419
    … …  
    497488
    498489    Frame& m_frame;
    499 #if ENABLE(DELETION_UI)
    500     std::unique_ptr<DeleteButtonController> m_deleteButtonController;
    501 #endif
    502490    RefPtr<CompositeEditCommand> m_lastEditCommand;
    503491    RefPtr<Text> m_compositionNode;
    … …  
    551539}
    552540
    553 #if !ENABLE(DELETION_UI)
    554 
    555 inline PassRefPtr<Range> Editor::avoidIntersectionWithDeleteButtonController(const Range* range) const
    556 {
    557     return const_cast<Range*>(range);
    558 }
    559 
    560 inline VisibleSelection Editor::avoidIntersectionWithDeleteButtonController(const VisibleSelection& selection) const
    561 {
    562     return selection;
    563 }
    564 
    565 #endif
    566 
    567541} // namespace WebCore
    568542

  • trunk/Source/WebCore/editing/MarkupAccumulator.cpp

    r174117 r175647  
    129129}
    130130
    131 String MarkupAccumulator::serializeNodes(Node& targetNode, Node* nodeToSkip, EChildrenOnly childrenOnly, Vector<QualifiedName>* tagNamesToSkip)
    132 {
    133     serializeNodesWithNamespaces(targetNode, nodeToSkip, childrenOnly, 0, tagNamesToSkip);
     131String MarkupAccumulator::serializeNodes(Node& targetNode, EChildrenOnly childrenOnly, Vector<QualifiedName>* tagNamesToSkip)
     132{
     133    serializeNodesWithNamespaces(targetNode, childrenOnly, 0, tagNamesToSkip);
    134134    return m_markup.toString();
    135135}
    136136
    137 void MarkupAccumulator::serializeNodesWithNamespaces(Node& targetNode, Node* nodeToSkip, EChildrenOnly childrenOnly, const Namespaces* namespaces, Vector<QualifiedName>* tagNamesToSkip)
    138 {
    139     if (&targetNode == nodeToSkip)
    140         return;
    141 
     137void MarkupAccumulator::serializeNodesWithNamespaces(Node& targetNode, EChildrenOnly childrenOnly, const Namespaces* namespaces, Vector<QualifiedName>* tagNamesToSkip)
     138{
    142139    if (tagNamesToSkip && is<Element>(targetNode)) {
    143140        for (auto& name : *tagNamesToSkip) {
    … …  
    166163#endif
    167164        for ( ; current; current = current->nextSibling())
    168             serializeNodesWithNamespaces(*current, nodeToSkip, IncludeNode, &namespaceHash, tagNamesToSkip);
     165            serializeNodesWithNamespaces(*current, IncludeNode, &namespaceHash, tagNamesToSkip);
    169166    }
    170167

  • trunk/Source/WebCore/editing/MarkupAccumulator.h

    r174117 r175647  
    6464    virtual ~MarkupAccumulator();
    6565
    66     String serializeNodes(Node& targetNode, Node* nodeToSkip, EChildrenOnly, Vector<QualifiedName>* tagNamesToSkip = nullptr);
     66    String serializeNodes(Node& targetNode, EChildrenOnly, Vector<QualifiedName>* tagNamesToSkip = nullptr);
    6767
    6868    static void appendCharactersReplacingEntities(StringBuilder&, const String&, unsigned, unsigned, EntityMask);
    … …  
    114114    String resolveURLIfNeeded(const Element&, const String&) const;
    115115    void appendQuotedURLAttributeValue(StringBuilder&, const Element&, const Attribute&);
    116     void serializeNodesWithNamespaces(Node& targetNode, Node* nodeToSkip, EChildrenOnly, const Namespaces*, Vector<QualifiedName>* tagNamesToSkip);
     116    void serializeNodesWithNamespaces(Node& targetNode, EChildrenOnly, const Namespaces*, Vector<QualifiedName>* tagNamesToSkip);
    117117    bool inXMLFragmentSerialization() const { return m_fragmentSerialization == XMLFragmentSerialization; }
    118118    void generateUniquePrefix(QualifiedName&, const Namespaces&);

  • trunk/Source/WebCore/editing/markup.cpp

    r175583 r175647  
    6363#include <wtf/text/StringBuilder.h>
    6464
    65 #if ENABLE(DELETION_UI)
    66 #include "DeleteButtonController.h"
    67 #endif
    68 
    6965namespace WebCore {
    7066
    … …  
    557553// FIXME: Shouldn't we omit style info when annotate == DoNotAnnotateForInterchange?
    558554// FIXME: At least, annotation and style info should probably not be included in range.markupString()
    559 static String createMarkupInternal(Document& document, const Range& range, const Range& updatedRange, Vector<Node*>* nodes,
     555static String createMarkupInternal(Document& document, const Range& range, Vector<Node*>* nodes,
    560556    EAnnotateForInterchange shouldAnnotate, bool convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs)
    561557{
    562558    DEPRECATED_DEFINE_STATIC_LOCAL(const String, interchangeNewlineString, (ASCIILiteral("<br class=\"" AppleInterchangeNewline "\">")));
    563559
    564     bool collapsed = updatedRange.collapsed(ASSERT_NO_EXCEPTION);
     560    bool collapsed = range.collapsed(ASSERT_NO_EXCEPTION);
    565561    if (collapsed)
    566562        return emptyString();
    567     Node* commonAncestor = updatedRange.commonAncestorContainer(ASSERT_NO_EXCEPTION);
     563    Node* commonAncestor = range.commonAncestorContainer(ASSERT_NO_EXCEPTION);
    568564    if (!commonAncestor)
    569565        return emptyString();
    … …  
    577573        && VisiblePosition(lastPositionInNode(body)) == VisiblePosition(range.endPosition()))
    578574        fullySelectedRoot = body;
    579     Node* specialCommonAncestor = highestAncestorToWrapMarkup(&updatedRange, shouldAnnotate);
     575    Node* specialCommonAncestor = highestAncestorToWrapMarkup(&range, shouldAnnotate);
    580576
    581577    bool needsPositionStyleConversion = body && fullySelectedRoot == body
    582578        && document.settings() && document.settings()->shouldConvertPositionStyleOnCopy();
    583     StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, &updatedRange, needsPositionStyleConversion, specialCommonAncestor);
    584     Node* pastEnd = updatedRange.pastLastNode();
    585 
    586     Node* startNode = updatedRange.firstNode();
    587     VisiblePosition visibleStart(updatedRange.startPosition(), VP_DEFAULT_AFFINITY);
    588     VisiblePosition visibleEnd(updatedRange.endPosition(), VP_DEFAULT_AFFINITY);
     579    StyledMarkupAccumulator accumulator(nodes, shouldResolveURLs, shouldAnnotate, &range, needsPositionStyleConversion, specialCommonAncestor);
     580    Node* pastEnd = range.pastLastNode();
     581
     582    Node* startNode = range.firstNode();
     583    VisiblePosition visibleStart(range.startPosition(), VP_DEFAULT_AFFINITY);
     584    VisiblePosition visibleEnd(range.endPosition(), VP_DEFAULT_AFFINITY);
    589585    if (shouldAnnotate == AnnotateForInterchange && needInterchangeNewlineAfter(visibleStart)) {
    590586        if (visibleStart == visibleEnd.previous())
    … …  
    652648String createMarkup(const Range& range, Vector<Node*>* nodes, EAnnotateForInterchange shouldAnnotate, bool convertBlocksToInlines, EAbsoluteURLs shouldResolveURLs)
    653649{
    654     Document& document = range.ownerDocument();
    655     const Range* updatedRange = &range;
    656 
    657 #if ENABLE(DELETION_UI)
    658     // Disable the delete button so it's elements are not serialized into the markup,
    659     // but make sure neither endpoint is inside the delete user interface.
    660     Frame* frame = document.frame();
    661     DeleteButtonControllerDisableScope deleteButtonControllerDisableScope(frame);
    662 
    663     RefPtr<Range> updatedRangeRef;
    664     if (frame) {
    665         updatedRangeRef = frame->editor().avoidIntersectionWithDeleteButtonController(&range);
    666         updatedRange = updatedRangeRef.get();
    667         if (!updatedRange)
    668             return emptyString();
    669     }
    670 #endif
    671 
    672     return createMarkupInternal(document, range, *updatedRange, nodes, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs);
     650    return createMarkupInternal(range.ownerDocument(), range, nodes, shouldAnnotate, convertBlocksToInlines, shouldResolveURLs);
    673651}
    674652
    … …  
    689667String createMarkup(const Node& node, EChildrenOnly childrenOnly, Vector<Node*>* nodes, EAbsoluteURLs shouldResolveURLs, Vector<QualifiedName>* tagNamesToSkip, EFragmentSerialization fragmentSerialization)
    690668{
    691     HTMLElement* deleteButtonContainerElement = 0;
    692 #if ENABLE(DELETION_UI)
    693     if (Frame* frame = node.document().frame()) {
    694         deleteButtonContainerElement = frame->editor().deleteButtonController().containerElement();
    695         if (node.isDescendantOf(deleteButtonContainerElement))
    696             return emptyString();
    697     }
    698 #endif
    699 
    700669    MarkupAccumulator accumulator(nodes, shouldResolveURLs, 0, fragmentSerialization);
    701     return accumulator.serializeNodes(const_cast<Node&>(node), deleteButtonContainerElement, childrenOnly, tagNamesToSkip);
     670    return accumulator.serializeNodes(const_cast<Node&>(node), childrenOnly, tagNamesToSkip);
    702671}
    703672

  • trunk/Source/WebCore/loader/EmptyClients.h

    r175055 r175647  
    526526#endif
    527527
    528 #if ENABLE(DELETION_UI)
    529     virtual bool shouldShowDeleteInterface(HTMLElement*) override { return false; }
    530 #endif
    531 
    532528#if PLATFORM(GTK)
    533529    virtual bool shouldShowUnicodeMenu() override { return false; }

  • trunk/Source/WebCore/page/EditorClient.h

    r174524 r175647  
    165165#endif
    166166   
    167 #if ENABLE(DELETION_UI)
    168     virtual bool shouldShowDeleteInterface(HTMLElement*) = 0;
    169 #endif
    170 
    171167#if PLATFORM(GTK)
    172168    virtual bool shouldShowUnicodeMenu() = 0;

  • trunk/Source/WebCore/page/Page.cpp

    r175384 r175647  
    814814    pageCache()->markPagesForDeviceScaleChanged(this);
    815815
    816     for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
    817         frame->editor().deviceScaleFactorChanged();
    818 
    819816    pageCache()->markPagesForFullStyleRecalc(this);
    820817    GraphicsContext::updateDocumentMarkerResources();

  • trunk/Source/WebCore/page/PageSerializer.cpp

    r175583 r175647  
    217217        return;
    218218    }
    219     String text = accumulator.serializeNodes(*document->documentElement(), 0, IncludeNode);
     219    String text = accumulator.serializeNodes(*document->documentElement(), IncludeNode);
    220220    CString frameHTML = textEncoding.encode(text, EntitiesForUnencodables);
    221221    m_resources->append(Resource(url, document->suggestedMIMEType(), SharedBuffer::create(frameHTML.data(), frameHTML.length())));

  • trunk/Source/WebCore/testing/Internals.cpp

    r175384 r175647  
    12861286}
    12871287
    1288 Node* Internals::findEditingDeleteButton()
    1289 {
    1290     Document* document = contextDocument();
    1291     if (!document || !document->frame())
    1292         return 0;
    1293 
    1294     updateEditorUINowIfScheduled();
    1295 
    1296     // FIXME: We shouldn't pollute the id namespace with this name.
    1297     return document->getElementById(String(ASCIILiteral("WebKit-Editing-Delete-Button")));
    1298 }
    1299 
    13001288bool Internals::hasSpellingMarker(int from, int length, ExceptionCode&)
    13011289{

  • trunk/Source/WebCore/testing/Internals.h

    r175384 r175647  
    169169    String parserMetaData(Deprecated::ScriptValue = Deprecated::ScriptValue());
    170170
    171     Node* findEditingDeleteButton();
    172171    void updateEditorUINowIfScheduled();
    173172

  • trunk/Source/WebCore/testing/Internals.idl

    r175384 r175647  
    138138    void updateEditorUINowIfScheduled();
    139139
    140     Node findEditingDeleteButton();
    141 
    142140    [RaisesException] boolean hasSpellingMarker(long from, long length);
    143141    [RaisesException] boolean hasGrammarMarker(long from, long length);

  • trunk/Source/WebKit/mac/ChangeLog

    r175626 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        * DefaultDelegates/WebDefaultEditingDelegate.m:
     9        (-[WebDefaultEditingDelegate webView:shouldShowDeleteInterfaceForElement:]): Deleted.
     10        * WebCoreSupport/WebEditorClient.h:
     11        * WebCoreSupport/WebEditorClient.mm:
     12        (WebEditorClient::shouldShowDeleteInterface): Deleted.
     13        * WebView/WebEditingDelegatePrivate.h: Removed declaration of
     14        -webView:shouldShowDeleteInterfaceForElement:.
     15
    1162014-11-03  Dean Jackson  <dino@apple.com>
    217

  • trunk/Source/WebKit/mac/DefaultDelegates/WebDefaultEditingDelegate.m

    r168047 r175647  
    4545    return sharedDelegate;
    4646}
    47 
    48 #if ENABLE(DELETION_UI)
    49 - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element
    50 {
    51     return NO;
    52 }
    53 #endif
    5447
    5548- (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range

  • trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h

    r173669 r175647  
    107107#endif
    108108
    109 #if ENABLE(DELETION_UI)
    110     virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) override;
    111 #endif
    112 
    113109    virtual TextCheckerClient* textChecker() override { return this; }
    114110

  • trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm

    r174225 r175647  
    237237        shouldDeleteDOMRange:kit(range)];
    238238}
    239 
    240 #if ENABLE(DELETION_UI)
    241 bool WebEditorClient::shouldShowDeleteInterface(HTMLElement* element)
    242 {
    243     return [[m_webView _editingDelegateForwarder] webView:m_webView
    244         shouldShowDeleteInterfaceForElement:kit(element)];
    245 }
    246 #endif
    247239
    248240bool WebEditorClient::smartInsertDeleteEnabled()

  • trunk/Source/WebKit/mac/WebView/WebEditingDelegatePrivate.h

    r168047 r175647  
    3333@interface NSObject (WebViewEditingDelegatePrivate)
    3434#if !TARGET_OS_IPHONE
    35 - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element;
    3635- (void)webView:(WebView *)webView didWriteSelectionToPasteboard:(NSPasteboard *)pasteboard;
    3736#else

  • trunk/Source/WebKit2/ChangeLog

    r175646 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
     9        (WebKit::WebEditorClient::shouldShowDeleteInterface): Deleted.
     10        * WebProcess/WebCoreSupport/WebEditorClient.h:
     11
    1122014-11-05  Conrad Shultz  <conrad_shultz@apple.com>
    213

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

    r174524 r175647  
    7777}
    7878
    79 #if ENABLE(DELETION_UI)
    80 bool WebEditorClient::shouldShowDeleteInterface(HTMLElement*)
    81 {
    82     notImplemented();
    83     return false;
    84 }
    85 #endif
    86 
    8779bool WebEditorClient::smartInsertDeleteEnabled()
    8880{

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.h

    r174524 r175647  
    122122#endif
    123123
    124 #if ENABLE(DELETION_UI)
    125     virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*) override;
    126 #endif
    127 
    128124#if PLATFORM(GTK)
    129125    bool executePendingEditorCommands(WebCore::Frame*, const Vector<WTF::String>&, bool);

  • trunk/Tools/ChangeLog

    r175638 r175647  
     12014-11-05  Dan Bernstein  <mitz@apple.com>
     2
     3        Remove the unused deletion UI feature
     4        https://bugs.webkit.org/show_bug.cgi?id=138442
     5
     6        Rubber-stamped by Alexey Proskuryakov.
     7
     8        * DumpRenderTree/mac/EditingDelegate.mm:
     9        (-[EditingDelegate webView:shouldShowDeleteInterfaceForElement:]): Deleted implementation of
     10        delegate method that’s been removed.
     11
    1122014-11-05  Alexey Proskuryakov  <ap@apple.com>
    213

  • trunk/Tools/DumpRenderTree/mac/EditingDelegate.mm

    r165676 r175647  
    120120}
    121121
    122 - (BOOL)webView:(WebView *)webView shouldShowDeleteInterfaceForElement:(DOMHTMLElement *)element
    123 {
    124     return [[element className] isEqualToString:@"needsDeletionUI"];
    125 }
    126 
    127122- (BOOL)webView:(WebView *)webView shouldChangeSelectedDOMRange:(DOMRange *)currentRange toDOMRange:(DOMRange *)proposedRange affinity:(NSSelectionAffinity)selectionAffinity stillSelecting:(BOOL)flag
    128123{
Note: See TracChangeset for help on using the changeset viewer.