Diff
Modified: trunk/Source/WebCore/ChangeLog (150128 => 150129)
--- trunk/Source/WebCore/ChangeLog 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/ChangeLog 2013-05-15 17:24:03 UTC (rev 150129)
@@ -1,5 +1,20 @@
2013-05-15 Darin Adler <[email protected]>
+ [Mac] Remove the ClipboardMac class and header file
+ https://bugs.webkit.org/show_bug.cgi?id=116165
+
+ Reviewed by Anders Carlsson.
+
+ * WebCore.xcodeproj/project.pbxproj: Remove ClipboardMac.h.
+ * editing/mac/EditorMac.mm: Import Clipboard.h rather than ClipboardMac.h.
+ * page/mac/EventHandlerMac.mm: Ditto.
+ * platform/mac/ClipboardMac.h: Removed.
+
+ * platform/mac/ClipboardMac.mm: Import Clipboard.h rather than ClipboardMac.h.
+ Deleted ClipboardMac constructor.
+
+2013-05-15 Darin Adler <[email protected]>
+
[Mac] Change Clipboard::create functions so they don't use ClipboardMac::create any more
https://bugs.webkit.org/show_bug.cgi?id=116163
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (150128 => 150129)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-05-15 17:24:03 UTC (rev 150129)
@@ -2942,7 +2942,6 @@
93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 65A640F00533BB1F0085E777 /* BlockExceptions.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199DE08245E59001E9ABC /* Position.h in Headers */ = {isa = PBXBuildFile; fileRef = BE91FC8B06133666005E3790 /* Position.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 51F6A3D60663BF04004D2919 /* HTMLCanvasElement.h */; };
- 93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 2D90660B0665D937006B6F1A /* ClipboardMac.h */; settings = {ATTRIBUTES = (Private, ); }; };
93F199EC08245E59001E9ABC /* XSLStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24A06D18A7E004A6FA3 /* XSLStyleSheet.h */; };
93F199ED08245E59001E9ABC /* XSLTProcessor.h in Headers */ = {isa = PBXBuildFile; fileRef = BC06F24C06D18A7E004A6FA3 /* XSLTProcessor.h */; };
93F199F008245E59001E9ABC /* WebCoreView.h in Headers */ = {isa = PBXBuildFile; fileRef = BE855F7F0701E83500239769 /* WebCoreView.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7105,7 +7104,6 @@
2D8FEBDB143E3EF70072502B /* CSSCrossfadeValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSCrossfadeValue.h; sourceTree = "<group>"; };
2D9066040BE141D400956998 /* LayoutState.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutState.cpp; sourceTree = "<group>"; };
2D9066050BE141D400956998 /* LayoutState.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LayoutState.h; sourceTree = "<group>"; };
- 2D90660B0665D937006B6F1A /* ClipboardMac.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = ClipboardMac.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
2D90660C0665D937006B6F1A /* ClipboardMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipboardMac.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
2D9A246A15B9BBDD00D34527 /* DOMSecurityPolicy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMSecurityPolicy.cpp; sourceTree = "<group>"; };
2D9A246B15B9BBDD00D34527 /* DOMSecurityPolicy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMSecurityPolicy.h; sourceTree = "<group>"; };
@@ -14624,7 +14622,6 @@
children = (
65A640F00533BB1F0085E777 /* BlockExceptions.h */,
65F80697054D9F86008BF776 /* BlockExceptions.mm */,
- 2D90660B0665D937006B6F1A /* ClipboardMac.h */,
2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
2919A1EA16B3378900787213 /* ContentFilterMac.mm */,
06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,
@@ -21179,7 +21176,6 @@
4B8AF4AA0B1CE02B00687690 /* ClipboardAccessPolicy.h in Headers */,
85031B400A44EFC700F992E0 /* ClipboardEvent.h in Headers */,
C585381913A7DD4E00A3BBEE /* ClipboardIOS.h in Headers */,
- 93F199E708245E59001E9ABC /* ClipboardMac.h in Headers */,
FB92DF4B15FED08700994433 /* ClipPathOperation.h in Headers */,
97AABD1314FA09D5007457AE /* CloseEvent.h in Headers */,
C0C054CB1118C8E400CE2636 /* CodeGenerator.pm in Headers */,
Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (150128 => 150129)
--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2013-05-15 17:24:03 UTC (rev 150129)
@@ -27,7 +27,7 @@
#import "Editor.h"
#import "ColorMac.h"
-#import "ClipboardMac.h"
+#import "Clipboard.h"
#import "CachedResourceLoader.h"
#import "DocumentFragment.h"
#import "DOMRangeInternal.h"
Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (150128 => 150129)
--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm 2013-05-15 17:24:03 UTC (rev 150129)
@@ -30,7 +30,7 @@
#include "BlockExceptions.h"
#include "Chrome.h"
#include "ChromeClient.h"
-#include "ClipboardMac.h"
+#include "Clipboard.h"
#include "DragController.h"
#include "EventNames.h"
#include "FocusController.h"
Deleted: trunk/Source/WebCore/platform/mac/ClipboardMac.h (150128 => 150129)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.h 2013-05-15 17:24:03 UTC (rev 150129)
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2004, 2006, 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.
- */
-
-#ifndef ClipboardMac_h
-#define ClipboardMac_h
-
-#include "Clipboard.h"
-
-namespace WebCore {
-
-class Frame;
-
-class ClipboardMac : public Clipboard {
- WTF_MAKE_FAST_ALLOCATED;
-public:
- enum ClipboardContents {
- DragAndDropData,
- DragAndDropFiles,
- CopyAndPasteGeneric
- };
-
- static PassRefPtr<ClipboardMac> create(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents, Frame*)
- {
- return adoptRef(new ClipboardMac(clipboardType, pasteboardName, policy, clipboardContents));
- }
-
-private:
- ClipboardMac(ClipboardType, const String& pasteboardName, ClipboardAccessPolicy, ClipboardContents);
-};
-
-}
-
-#endif
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (150128 => 150129)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-05-15 17:24:03 UTC (rev 150129)
@@ -24,7 +24,7 @@
*/
#import "config.h"
-#import "ClipboardMac.h"
+#import "Clipboard.h"
#import "CachedImage.h"
#import "DOMElementInternal.h"
@@ -57,11 +57,6 @@
return adoptRef(new Clipboard(policy, CopyAndPaste, Pasteboard::create(pasteboardName)));
}
-ClipboardMac::ClipboardMac(ClipboardType clipboardType, const String& pasteboardName, ClipboardAccessPolicy policy, ClipboardContents clipboardContents)
- : Clipboard(policy, clipboardType, Pasteboard::create(pasteboardName), clipboardContents == DragAndDropFiles)
-{
-}
-
void Clipboard::declareAndWriteDragImage(Element* element, const KURL& url, const String& title, Frame* frame)
{
ASSERT(frame);
Modified: trunk/Source/WebKit/mac/ChangeLog (150128 => 150129)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-15 17:24:03 UTC (rev 150129)
@@ -1,5 +1,14 @@
2013-05-15 Darin Adler <[email protected]>
+ [Mac] Remove the ClipboardMac class and header file
+ https://bugs.webkit.org/show_bug.cgi?id=116165
+
+ Reviewed by Anders Carlsson.
+
+ * WebCoreSupport/WebDragClient.mm: Import Clipboard.h instead of ClipboardMac.h.
+
+2013-05-15 Darin Adler <[email protected]>
+
[Mac] Thin out the ClipboardMac class and header file to prepare for deleting them
https://bugs.webkit.org/show_bug.cgi?id=116159
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm (150128 => 150129)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2013-05-15 17:23:44 UTC (rev 150128)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebDragClient.mm 2013-05-15 17:24:03 UTC (rev 150129)
@@ -41,7 +41,7 @@
#import "WebUIDelegate.h"
#import "WebUIDelegatePrivate.h"
#import "WebViewInternal.h"
-#import <WebCore/ClipboardMac.h>
+#import <WebCore/Clipboard.h>
#import <WebCore/DragData.h>
#import <WebCore/Editor.h>
#import <WebCore/EditorClient.h>
