Changeset 86854 in webkit


Ignore:
Timestamp:
May 19, 2011 10:46:09 AM (13 years ago)
Author:
rniwa@webkit.org
Message:

2011-05-19 Ryosuke Niwa <rniwa@webkit.org>

Reviewed by Darin Adler.

JoinTextNodesCommand is never used
https://bugs.webkit.org/show_bug.cgi?id=61089

Deleted JoinTextNodesCommand because it's never used.

  • CMakeLists.txt:
  • GNUmakefile.list.am:
  • WebCore.gypi:
  • WebCore.pro:
  • WebCore.vcproj/WebCore.vcproj:
  • WebCore.xcodeproj/project.pbxproj:
  • editing/CompositeEditCommand.cpp:
  • editing/CompositeEditCommand.h:
  • editing/EditingAllInOne.cpp:
  • editing/JoinTextNodesCommand.cpp: Removed.
  • editing/JoinTextNodesCommand.h: Removed.
Location:
trunk/Source/WebCore
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r86764 r86854  
    664664    editing/InsertParagraphSeparatorCommand.cpp
    665665    editing/InsertTextCommand.cpp
    666     editing/JoinTextNodesCommand.cpp
    667666    editing/MarkupAccumulator.cpp
    668667    editing/MergeIdenticalElementsCommand.cpp
  • trunk/Source/WebCore/ChangeLog

    r86852 r86854  
     12011-05-19  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        JoinTextNodesCommand is never used
     6        https://bugs.webkit.org/show_bug.cgi?id=61089
     7
     8        Deleted JoinTextNodesCommand because it's never used.
     9
     10        * CMakeLists.txt:
     11        * GNUmakefile.list.am:
     12        * WebCore.gypi:
     13        * WebCore.pro:
     14        * WebCore.vcproj/WebCore.vcproj:
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * editing/CompositeEditCommand.cpp:
     17        * editing/CompositeEditCommand.h:
     18        * editing/EditingAllInOne.cpp:
     19        * editing/JoinTextNodesCommand.cpp: Removed.
     20        * editing/JoinTextNodesCommand.h: Removed.
     21
    1222011-05-19  Ryosuke Niwa  <rniwa@webkit.org>
    223
  • trunk/Source/WebCore/GNUmakefile.list.am

    r86765 r86854  
    13491349        Source/WebCore/editing/InsertTextCommand.cpp \
    13501350        Source/WebCore/editing/InsertTextCommand.h \
    1351         Source/WebCore/editing/JoinTextNodesCommand.cpp \
    1352         Source/WebCore/editing/JoinTextNodesCommand.h \
    13531351        Source/WebCore/editing/markup.cpp \
    13541352        Source/WebCore/editing/markup.h \
  • trunk/Source/WebCore/WebCore.gypi

    r86805 r86854  
    26442644            'editing/InsertTextCommand.cpp',
    26452645            'editing/InsertTextCommand.h',
    2646             'editing/JoinTextNodesCommand.cpp',
    2647             'editing/JoinTextNodesCommand.h',
    26482646            'editing/MarkupAccumulator.cpp',
    26492647            'editing/MarkupAccumulator.h',
  • trunk/Source/WebCore/WebCore.pro

    r86765 r86854  
    585585    editing/InsertParagraphSeparatorCommand.cpp \
    586586    editing/InsertTextCommand.cpp \
    587     editing/JoinTextNodesCommand.cpp \
    588587    editing/markup.cpp \
    589588    editing/MarkupAccumulator.cpp \
     
    15601559    editing/InsertParagraphSeparatorCommand.h \
    15611560    editing/InsertTextCommand.h \
    1562     editing/JoinTextNodesCommand.h \
    15631561    editing/markup.h \
    15641562    editing/MergeIdenticalElementsCommand.h \
  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r86765 r86854  
    4962349623                        </File>
    4962449624                        <File
    49625                                 RelativePath="..\editing\JoinTextNodesCommand.cpp"
    49626                                 >
    49627                                 <FileConfiguration
    49628                                         Name="Debug|Win32"
    49629                                         ExcludedFromBuild="true"
    49630                                         >
    49631                                         <Tool
    49632                                                 Name="VCCLCompilerTool"
    49633                                         />
    49634                                 </FileConfiguration>
    49635                                 <FileConfiguration
    49636                                         Name="Release|Win32"
    49637                                         ExcludedFromBuild="true"
    49638                                         >
    49639                                         <Tool
    49640                                                 Name="VCCLCompilerTool"
    49641                                         />
    49642                                 </FileConfiguration>
    49643                                 <FileConfiguration
    49644                                         Name="Debug_Cairo_CFLite|Win32"
    49645                                         ExcludedFromBuild="true"
    49646                                         >
    49647                                         <Tool
    49648                                                 Name="VCCLCompilerTool"
    49649                                         />
    49650                                 </FileConfiguration>
    49651                                 <FileConfiguration
    49652                                         Name="Release_Cairo_CFLite|Win32"
    49653                                         ExcludedFromBuild="true"
    49654                                         >
    49655                                         <Tool
    49656                                                 Name="VCCLCompilerTool"
    49657                                         />
    49658                                 </FileConfiguration>
    49659                                 <FileConfiguration
    49660                                         Name="Debug_All|Win32"
    49661                                         ExcludedFromBuild="true"
    49662                                         >
    49663                                         <Tool
    49664                                                 Name="VCCLCompilerTool"
    49665                                         />
    49666                                 </FileConfiguration>
    49667                                 <FileConfiguration
    49668                                         Name="Production|Win32"
    49669                                         ExcludedFromBuild="true"
    49670                                         >
    49671                                         <Tool
    49672                                                 Name="VCCLCompilerTool"
    49673                                         />
    49674                                 </FileConfiguration>
    49675                         </File>
    49676                         <File
    49677                                 RelativePath="..\editing\JoinTextNodesCommand.h"
    49678                                 >
    49679                         </File>
    49680                         <File
    4968149625                                RelativePath="..\editing\markup.cpp"
    4968249626                                >
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r86775 r86854  
    28102810                93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DA2099E64910056E581 /* InsertTextCommand.cpp */; };
    28112811                93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DA3099E64910056E581 /* InsertTextCommand.h */; };
    2812                 93309DF3099E64920056E581 /* JoinTextNodesCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DA4099E64910056E581 /* JoinTextNodesCommand.cpp */; };
    2813                 93309DF4099E64920056E581 /* JoinTextNodesCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DA5099E64910056E581 /* JoinTextNodesCommand.h */; };
    28142812                93309DF7099E64920056E581 /* markup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93309DA8099E64910056E581 /* markup.cpp */; };
    28152813                93309DF8099E64920056E581 /* markup.h in Headers */ = {isa = PBXBuildFile; fileRef = 93309DA9099E64910056E581 /* markup.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    93349332                93309DA2099E64910056E581 /* InsertTextCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertTextCommand.cpp; sourceTree = "<group>"; };
    93359333                93309DA3099E64910056E581 /* InsertTextCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InsertTextCommand.h; sourceTree = "<group>"; };
    9336                 93309DA4099E64910056E581 /* JoinTextNodesCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JoinTextNodesCommand.cpp; sourceTree = "<group>"; };
    9337                 93309DA5099E64910056E581 /* JoinTextNodesCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JoinTextNodesCommand.h; sourceTree = "<group>"; };
    93389334                93309DA8099E64910056E581 /* markup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = markup.cpp; sourceTree = "<group>"; };
    93399335                93309DA9099E64910056E581 /* markup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = markup.h; sourceTree = "<group>"; };
     
    1555915555                                93309DA2099E64910056E581 /* InsertTextCommand.cpp */,
    1556015556                                93309DA3099E64910056E581 /* InsertTextCommand.h */,
    15561                                 93309DA4099E64910056E581 /* JoinTextNodesCommand.cpp */,
    15562                                 93309DA5099E64910056E581 /* JoinTextNodesCommand.h */,
    1556315557                                93309DA8099E64910056E581 /* markup.cpp */,
    1556415558                                93309DA9099E64910056E581 /* markup.h */,
     
    2131221306                                59EE122E1106080F00885116 /* JNIUtilityPrivate.h in Headers */,
    2131321307                                596950821321059900C3ED18 /* JobjectWrapper.h in Headers */,
    21314                                 93309DF4099E64920056E581 /* JoinTextNodesCommand.h in Headers */,
    2131521308                                418F88050FF957AF0080F045 /* JSAbstractWorker.h in Headers */,
    2131621309                                49EECF01105070C400099FAB /* JSArrayBuffer.h in Headers */,
     
    2410424097                                59EE122C1106080500885116 /* JNIUtilityPrivate.cpp in Sources */,
    2410524098                                59695084132105A500C3ED18 /* JobjectWrapper.cpp in Sources */,
    24106                                 93309DF3099E64920056E581 /* JoinTextNodesCommand.cpp in Sources */,
    2410724099                                418F88040FF957AE0080F045 /* JSAbstractWorker.cpp in Sources */,
    2410824100                                49EECF00105070C400099FAB /* JSArrayBuffer.cpp in Sources */,
  • trunk/Source/WebCore/editing/CompositeEditCommand.cpp

    r86813 r86854  
    4444#include "InsertParagraphSeparatorCommand.h"
    4545#include "InsertTextCommand.h"
    46 #include "JoinTextNodesCommand.h"
    4746#include "MergeIdenticalElementsCommand.h"
    4847#include "Range.h"
     
    292291{
    293292    applyCommandToComposite(SplitTextNodeContainingElementCommand::create(text, offset));
    294 }
    295 
    296 void CompositeEditCommand::joinTextNodes(PassRefPtr<Text> text1, PassRefPtr<Text> text2)
    297 {
    298     applyCommandToComposite(JoinTextNodesCommand::create(text1, text2));
    299293}
    300294
  • trunk/Source/WebCore/editing/CompositeEditCommand.h

    r86295 r86854  
    6767    void insertLineBreak();
    6868    void insertTextIntoNode(PassRefPtr<Text>, unsigned offset, const String& text);
    69     void joinTextNodes(PassRefPtr<Text>, PassRefPtr<Text>);
    7069    void mergeIdenticalElements(PassRefPtr<Element>, PassRefPtr<Element>);
    7170    void rebalanceWhitespace();
  • trunk/Source/WebCore/editing/EditingAllInOne.cpp

    r85864 r86854  
    5050#include <InsertParagraphSeparatorCommand.cpp>
    5151#include <InsertTextCommand.cpp>
    52 #include <JoinTextNodesCommand.cpp>
    5352#include <MarkupAccumulator.cpp>
    5453#include <MergeIdenticalElementsCommand.cpp>
Note: See TracChangeset for help on using the changeset viewer.