Diff
Modified: trunk/Source/WebCore/ChangeLog (154226 => 154227)
--- trunk/Source/WebCore/ChangeLog 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/ChangeLog 2013-08-17 14:41:40 UTC (rev 154227)
@@ -1,5 +1,36 @@
2013-08-17 Darin Adler <[email protected]>
+ <https://webkit.org/b/119939> Remove some unused clipboard and pasteboard code
+
+ Reviewed by Andreas Kling.
+
+ * PlatformWinCE.cmake: Removed EditorWin.cpp.
+ * WebCore.vcxproj/WebCore.vcxproj: Removed EditorWin.cpp.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Removed EditorWin.cpp.
+ * WebCore.xcodeproj/project.pbxproj: Removed ClipboardIOS.h and
+ ClipboardIOS.mm, and also let Xcode edit/reorder this file.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::dispatchCPPEvent): Removed some LEGACY_STYLE_ABSTRACT_CLIPBOARD
+ class code. Will remove the rest later.
+
+ * editing/Editor.h: Removed declaration of newGeneralClipboard.
+
+ * platform/Pasteboard.h: Removed declaration of writeClipboard. Also updated a
+ comment to make it clearer.
+
+ * platform/blackberry/PasteboardBlackBerry.cpp: Removed Pasteboard::writeClipboard.
+ * platform/efl/PasteboardEfl.cpp: Ditto.
+ * platform/ios/PasteboardIOS.mm: Ditto.
+ * platform/win/PasteboardWin.cpp: Ditto.
+
+ * platform/ios/ClipboardIOS.h: Removed. Was an empty file.
+ * platform/ios/ClipboardIOS.mm: Removed. Was an empty file.
+ * platform/win/EditorWin.cpp: Removed. Had only newGeneralClipboard in the file,
+ a function that is never called.
+
+2013-08-17 Darin Adler <[email protected]>
+
<https://webkit.org/b/119940> Rename Clipboard::m_dragLoc to m_dragLocation
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/PlatformWinCE.cmake (154226 => 154227)
--- trunk/Source/WebCore/PlatformWinCE.cmake 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/PlatformWinCE.cmake 2013-08-17 14:41:40 UTC (rev 154227)
@@ -42,7 +42,6 @@
platform/win/CursorWin.cpp
platform/win/DragDataWin.cpp
platform/win/DragImageWin.cpp
- platform/win/EditorWin.cpp
platform/win/EventLoopWin.cpp
platform/win/FileSystemWin.cpp
platform/win/KeyEventWin.cpp
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (154226 => 154227)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-08-17 14:41:40 UTC (rev 154227)
@@ -7464,7 +7464,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\platform\win\DragImageWin.cpp" />
- <ClCompile Include="..\platform\win\EditorWin.cpp" />
<ClCompile Include="..\platform\win\EventLoopWin.cpp" />
<ClCompile Include="..\platform\win\FileSystemWin.cpp" />
<ClCompile Include="..\platform\win\GDIObjectCounter.cpp" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (154226 => 154227)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-08-17 14:41:40 UTC (rev 154227)
@@ -1257,9 +1257,6 @@
<ClCompile Include="..\platform\win\DragImageWin.cpp">
<Filter>platform\win</Filter>
</ClCompile>
- <ClCompile Include="..\platform\win\EditorWin.cpp">
- <Filter>platform\win</Filter>
- </ClCompile>
<ClCompile Include="..\platform\win\EventLoopWin.cpp">
<Filter>platform\win</Filter>
</ClCompile>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (154226 => 154227)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-17 14:41:40 UTC (rev 154227)
@@ -5108,8 +5108,6 @@
C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */; };
C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */; };
C57FEDE11212EE9C0097BE65 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */; };
- C585381913A7DD4E00A3BBEE /* ClipboardIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */; };
- C585381A13A7DD4E00A3BBEE /* ClipboardIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */; };
C585A66211D4FAC5004C3E4B /* IDBBindingUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */; };
C585A66311D4FAC5004C3E4B /* IDBBindingUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */; };
C585A67D11D4FB08004C3E4B /* JSIDBAny.h in Headers */ = {isa = PBXBuildFile; fileRef = C585A66511D4FB07004C3E4B /* JSIDBAny.h */; };
@@ -5211,7 +5209,6 @@
CE057FA61220731100A476D5 /* DocumentMarkerController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE057FA41220731100A476D5 /* DocumentMarkerController.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE08C3D1152B599A0021B8C2 /* AlternativeTextController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */; };
CE08C3D2152B599A0021B8C2 /* AlternativeTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */; settings = {ATTRIBUTES = (); }; };
- FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D390CEA934600D89466 /* EditorIOS.mm */; };
CE7B2DB31586ABAD0098B3FA /* AlternativeTextUIController.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE7B2DB41586ABAD0098B3FA /* AlternativeTextUIController.mm in Sources */ = {isa = PBXBuildFile; fileRef = CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */; };
CE7B2DB51586ABAD0098B3FA /* TextAlternativeWithRange.h in Headers */ = {isa = PBXBuildFile; fileRef = CE7B2DB11586ABAD0098B3FA /* TextAlternativeWithRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -5994,6 +5991,7 @@
FEB26D28167A8F2A00FDD26B /* DatabaseServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEB26D27167A8F2A00FDD26B /* DatabaseServer.cpp */; };
FEBC5F3116BD0CC300659BD3 /* DatabaseBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */; };
FEBC5F3216BD0CC300659BD3 /* DatabaseBase.h in Headers */ = {isa = PBXBuildFile; fileRef = FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D390CEA934600D89466 /* EditorIOS.mm */; };
FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */; };
FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDEF84016797108000E444A /* DatabaseStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
FEE1811316C319E800084849 /* SQLTransactionBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */; };
@@ -11803,8 +11801,6 @@
C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageNamespaceImpl.cpp; sourceTree = "<group>"; };
C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBIndex.h; sourceTree = "<group>"; };
C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSystem.cpp; sourceTree = "<group>"; };
- C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClipboardIOS.h; path = ios/ClipboardIOS.h; sourceTree = "<group>"; };
- C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ClipboardIOS.mm; path = ios/ClipboardIOS.mm; sourceTree = "<group>"; };
C585A66011D4FAC5004C3E4B /* IDBBindingUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IDBBindingUtilities.cpp; sourceTree = "<group>"; };
C585A66111D4FAC5004C3E4B /* IDBBindingUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IDBBindingUtilities.h; sourceTree = "<group>"; };
C585A66511D4FB07004C3E4B /* JSIDBAny.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSIDBAny.h; sourceTree = "<group>"; };
@@ -11947,7 +11943,6 @@
CE057FA41220731100A476D5 /* DocumentMarkerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentMarkerController.h; sourceTree = "<group>"; };
CE08C3CF152B599A0021B8C2 /* AlternativeTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AlternativeTextController.cpp; sourceTree = "<group>"; };
CE08C3D0152B599A0021B8C2 /* AlternativeTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AlternativeTextController.h; sourceTree = "<group>"; };
- FED13D390CEA934600D89466 /* EditorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorIOS.mm; sourceTree = "<group>"; };
CE5CB1B314EDAB6F00BB2795 /* EventSender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventSender.h; sourceTree = "<group>"; };
CE7B2DAF1586ABAD0098B3FA /* AlternativeTextUIController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AlternativeTextUIController.h; path = mac/AlternativeTextUIController.h; sourceTree = "<group>"; };
CE7B2DB01586ABAD0098B3FA /* AlternativeTextUIController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AlternativeTextUIController.mm; path = mac/AlternativeTextUIController.mm; sourceTree = "<group>"; };
@@ -12841,6 +12836,7 @@
FEB26D27167A8F2A00FDD26B /* DatabaseServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseServer.cpp; path = Modules/webdatabase/DatabaseServer.cpp; sourceTree = "<group>"; };
FEBC5F2F16BD0CC300659BD3 /* DatabaseBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBase.cpp; path = Modules/webdatabase/DatabaseBase.cpp; sourceTree = "<group>"; };
FEBC5F3016BD0CC300659BD3 /* DatabaseBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBase.h; path = Modules/webdatabase/DatabaseBase.h; sourceTree = "<group>"; };
+ FED13D390CEA934600D89466 /* EditorIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EditorIOS.mm; sourceTree = "<group>"; };
FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseStrategy.cpp; sourceTree = "<group>"; };
FEDEF84016797108000E444A /* DatabaseStrategy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseStrategy.h; sourceTree = "<group>"; };
FEE1811116C319E800084849 /* SQLTransactionBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SQLTransactionBackend.cpp; path = Modules/webdatabase/SQLTransactionBackend.cpp; sourceTree = "<group>"; };
@@ -13957,6 +13953,14 @@
name = mathml;
sourceTree = "<group>";
};
+ 443292C10EBA6D7300E62016 /* ios */ = {
+ isa = PBXGroup;
+ children = (
+ FED13D390CEA934600D89466 /* EditorIOS.mm */,
+ );
+ path = ios;
+ sourceTree = "<group>";
+ };
449195900FBE175B00D9F824 /* Exports */ = {
isa = PBXGroup;
children = (
@@ -16460,8 +16464,6 @@
A59E3C1B11580F340072928E /* ios */ = {
isa = PBXGroup;
children = (
- C585381713A7DD4E00A3BBEE /* ClipboardIOS.h */,
- C585381813A7DD4E00A3BBEE /* ClipboardIOS.mm */,
2655414B1489AA2B000DFC5D /* CursorIOS.cpp */,
26F40D4914904A6300CA67C4 /* EventLoopIOS.mm */,
26C17A3C1491D2D400D12BA2 /* FileSystemIOS.h */,
@@ -19391,14 +19393,6 @@
name = EncryptedMedia;
sourceTree = "<group>";
};
- 443292C10EBA6D7300E62016 /* ios */ = {
- isa = PBXGroup;
- children = (
- FED13D390CEA934600D89466 /* EditorIOS.mm */,
- );
- path = ios;
- sourceTree = "<group>";
- };
DF9AFD6F13FC31B00015FEB7 /* objc */ = {
isa = PBXGroup;
children = (
@@ -21070,7 +21064,6 @@
85031B3E0A44EFC700F992E0 /* Clipboard.h in Headers */,
4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
- C585381913A7DD4E00A3BBEE /* ClipboardIOS.h in Headers */,
FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
C0C054CB1118C8E400CE2636 /* CodeGenerator.pm in Headers */,
@@ -24503,7 +24496,6 @@
BCC065800F3CE1B700CD2D87 /* ClientRectList.cpp in Sources */,
A784941B0B5FE507001E237A /* Clipboard.cpp in Sources */,
85031B3F0A44EFC700F992E0 /* ClipboardEvent.cpp in Sources */,
- C585381A13A7DD4E00A3BBEE /* ClipboardIOS.mm in Sources */,
93F19AFF08245E59001E9ABC /* ClipboardMac.mm in Sources */,
CDEA76351460B71A008B31F1 /* Clock.cpp in Sources */,
CDEA76341460B56F008B31F1 /* ClockGeneric.cpp in Sources */,
Modified: trunk/Source/WebCore/editing/Editor.cpp (154226 => 154227)
--- trunk/Source/WebCore/editing/Editor.cpp 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/editing/Editor.cpp 2013-08-17 14:41:40 UTC (rev 154227)
@@ -700,12 +700,7 @@
if (!target)
return true;
-#if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)
RefPtr<Clipboard> clipboard = Clipboard::createForCopyAndPaste(policy);
-#else
- // FIXME: Remove declaration of newGeneralClipboard when removing LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS.
- RefPtr<Clipboard> clipboard = newGeneralClipboard(policy, m_frame);
-#endif
#if PLATFORM(IOS)
clipboard->pasteboard().setFrame(m_frame);
@@ -717,11 +712,7 @@
if (noDefaultProcessing && policy == ClipboardWritable) {
Pasteboard* pasteboard = Pasteboard::generalPasteboard();
pasteboard->clear();
-#if !USE(LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS)
pasteboard->writePasteboard(clipboard->pasteboard());
-#else
- pasteboard->writeClipboard(clipboard.get());
-#endif
}
// invalidate clipboard here for security
Modified: trunk/Source/WebCore/editing/Editor.h (154226 => 154227)
--- trunk/Source/WebCore/editing/Editor.h 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/editing/Editor.h 2013-08-17 14:41:40 UTC (rev 154227)
@@ -439,7 +439,6 @@
bool canDeleteRange(Range*) const;
bool canSmartReplaceWithPasteboard(Pasteboard*);
- PassRefPtr<Clipboard> newGeneralClipboard(ClipboardAccessPolicy, Frame*);
void pasteAsPlainTextWithPasteboard(Pasteboard*);
void pasteWithPasteboard(Pasteboard*, bool allowPlainText);
Modified: trunk/Source/WebCore/platform/Pasteboard.h (154226 => 154227)
--- trunk/Source/WebCore/platform/Pasteboard.h 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2013-08-17 14:41:40 UTC (rev 154227)
@@ -49,9 +49,8 @@
typedef struct HWND__* HWND;
#endif
-// FIXME: This class is too high-level to be in the platform directory, since it
-// uses the DOM and makes calls to Editor. It should either be divested of its
-// knowledge of the frame and editor or moved into the editing directory.
+// FIXME: This class uses the DOM and makes calls to Editor.
+// It should be divested of its knowledge of the frame and editor.
namespace WebCore {
@@ -142,7 +141,6 @@
static NSArray* supportedPasteboardTypes();
#endif
void writePasteboard(const Pasteboard& sourcePasteboard);
- void writeClipboard(Clipboard*);
void clear();
void clear(const String& type);
Modified: trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp (154226 => 154227)
--- trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/blackberry/PasteboardBlackBerry.cpp 2013-08-17 14:41:40 UTC (rev 154227)
@@ -56,11 +56,6 @@
notImplemented();
}
-void Pasteboard::writeClipboard(Clipboard*)
-{
- notImplemented();
-}
-
void Pasteboard::writeSelection(Range* selectedRange, bool, Frame* frame, ShouldSerializeSelectedTextForClipboard shouldSerializeSelectedTextForClipboard)
{
WTF::String text = shouldSerializeSelectedTextForClipboard == IncludeImageAltTextForClipboard ? frame->editor()->selectedTextForClipboard() : frame->editor()->selectedText();
Modified: trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp (154226 => 154227)
--- trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/efl/PasteboardEfl.cpp 2013-08-17 14:41:40 UTC (rev 154227)
@@ -60,11 +60,6 @@
notImplemented();
}
-void Pasteboard::writeClipboard(Clipboard*)
-{
- notImplemented();
-}
-
void Pasteboard::clear()
{
notImplemented();
Deleted: trunk/Source/WebCore/platform/ios/ClipboardIOS.h (154226 => 154227)
--- trunk/Source/WebCore/platform/ios/ClipboardIOS.h 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/ios/ClipboardIOS.h 2013-08-17 14:41:40 UTC (rev 154227)
@@ -1 +0,0 @@
-#error
Deleted: trunk/Source/WebCore/platform/ios/ClipboardIOS.mm (154226 => 154227)
--- trunk/Source/WebCore/platform/ios/ClipboardIOS.mm 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/ios/ClipboardIOS.mm 2013-08-17 14:41:40 UTC (rev 154227)
@@ -1 +0,0 @@
-// Empty. Should be deleted.
Modified: trunk/Source/WebCore/platform/ios/PasteboardIOS.mm (154226 => 154227)
--- trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/ios/PasteboardIOS.mm 2013-08-17 14:41:40 UTC (rev 154227)
@@ -210,10 +210,6 @@
{
}
-void Pasteboard::writeClipboard(Clipboard*)
-{
-}
-
void Pasteboard::writePasteboard(const Pasteboard&)
{
}
Deleted: trunk/Source/WebCore/platform/win/EditorWin.cpp (154226 => 154227)
--- trunk/Source/WebCore/platform/win/EditorWin.cpp 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/win/EditorWin.cpp 2013-08-17 14:41:40 UTC (rev 154227)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "Editor.h"
-
-#include "Clipboard.h"
-#include "Frame.h"
-
-namespace WebCore {
-
-// FIXME: Delete this file when removing LEGACY_STYLE_ABSTRACT_CLIPBOARD_CLASS.
-PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame* frame)
-{
- return Clipboard::createForCopyAndPaste(policy);
-}
-
-} // namespace WebCore
Modified: trunk/Source/WebCore/platform/win/PasteboardWin.cpp (154226 => 154227)
--- trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-08-17 14:39:44 UTC (rev 154226)
+++ trunk/Source/WebCore/platform/win/PasteboardWin.cpp 2013-08-17 14:41:40 UTC (rev 154227)
@@ -776,11 +776,6 @@
notImplemented();
}
-void Pasteboard::writeClipboard(Clipboard*)
-{
- notImplemented();
-}
-
bool Pasteboard::canSmartReplace()
{
return ::IsClipboardFormatAvailable(WebSmartPasteFormat);
