Diff
Modified: trunk/Source/WebCore/ChangeLog (154573 => 154574)
--- trunk/Source/WebCore/ChangeLog 2013-08-25 09:54:09 UTC (rev 154573)
+++ trunk/Source/WebCore/ChangeLog 2013-08-25 10:00:37 UTC (rev 154574)
@@ -1,5 +1,18 @@
2013-08-25 Darin Adler <[email protected]>
+ Clipboard is in DOM directory, but ClipboardMac is in platform directory
+ https://bugs.webkit.org/show_bug.cgi?id=120267
+
+ Reviewed by Andreas Kling.
+
+ This file is almost gone; has just one function in it. Move it for now, and later
+ we can delete it entirely.
+
+ * WebCore.xcodeproj/project.pbxproj: Updated for new file location.
+ * dom/ClipboardMac.mm: Moved from Source/WebCore/platform/mac/ClipboardMac.mm.
+
+2013-08-25 Darin Adler <[email protected]>
+
No need for notifyChromeClientWheelEventHandlerCountChanged in Frame
https://bugs.webkit.org/show_bug.cgi?id=120264
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (154573 => 154574)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-25 09:54:09 UTC (rev 154573)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2013-08-25 10:00:37 UTC (rev 154574)
@@ -14515,7 +14515,6 @@
children = (
65A640F00533BB1F0085E777 /* BlockExceptions.h */,
65F80697054D9F86008BF776 /* BlockExceptions.mm */,
- 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
2919A1EA16B3378900787213 /* ContentFilterMac.mm */,
06027CB20B1CC03D00884B2D /* ContextMenuItemMac.mm */,
93B6A0E90B0BCA8400F5027A /* ContextMenuMac.mm */,
@@ -20115,6 +20114,7 @@
4B8AF4A90B1CE02B00687690 /* ClipboardAccessPolicy.h */,
85031B290A44EFC700F992E0 /* ClipboardEvent.cpp */,
85031B2A0A44EFC700F992E0 /* ClipboardEvent.h */,
+ 2D90660C0665D937006B6F1A /* ClipboardMac.mm */,
6550B697099DF0270090D781 /* Comment.cpp */,
6550B698099DF0270090D781 /* Comment.h */,
85089CC70A98C22600A275AA /* Comment.idl */,
Copied: trunk/Source/WebCore/dom/ClipboardMac.mm (from rev 154573, trunk/Source/WebCore/platform/mac/ClipboardMac.mm) (0 => 154574)
--- trunk/Source/WebCore/dom/ClipboardMac.mm (rev 0)
+++ trunk/Source/WebCore/dom/ClipboardMac.mm 2013-08-25 10:00:37 UTC (rev 154574)
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2004, 2005, 2006, 2008, 2010, 2013 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.
+ */
+
+#import "config.h"
+#import "Clipboard.h"
+
+#import "CachedImage.h"
+#import "Element.h"
+#import "FrameSnapshottingMac.h"
+
+namespace WebCore {
+
+// FIXME: Need to refactor and figure out how to handle the flipping in a more sensible way so we can
+// use the default Clipboard::dragImage from Clipboard.cpp. Note also that this handles cases that
+// Clipboard::dragImage in Clipboard.cpp does not handle correctly, so must resolve that as well.
+DragImageRef Clipboard::createDragImage(IntPoint& location) const
+{
+ NSImage *result = nil;
+ if (m_dragImageElement) {
+ Document* document = m_dragImageElement->document();
+ if (Frame* frame = document->frame()) {
+ NSRect imageRect;
+ NSRect elementRect;
+ result = snapshotDragImage(frame, m_dragImageElement.get(), &imageRect, &elementRect);
+ // Client specifies point relative to element, not the whole image, which may include child
+ // layers spread out all over the place.
+ location.setX(elementRect.origin.x - imageRect.origin.x + m_dragLocation.x());
+ location.setY(imageRect.size.height - (elementRect.origin.y - imageRect.origin.y + m_dragLocation.y()));
+ }
+ } else if (m_dragImage) {
+ result = m_dragImage->image()->getNSImage();
+
+ location = m_dragLocation;
+ location.setY([result size].height - location.y());
+ }
+ return result;
+}
+
+}
Deleted: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (154573 => 154574)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-08-25 09:54:09 UTC (rev 154573)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-08-25 10:00:37 UTC (rev 154574)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2006, 2008, 2010, 2013 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.
- */
-
-#import "config.h"
-#import "Clipboard.h"
-
-#import "CachedImage.h"
-#import "Element.h"
-#import "FrameSnapshottingMac.h"
-
-namespace WebCore {
-
-// FIXME: Need to refactor and figure out how to handle the flipping in a more sensible way so we can
-// use the default Clipboard::dragImage from Clipboard.cpp. Note also that this handles cases that
-// Clipboard::dragImage in Clipboard.cpp does not handle correctly, so must resolve that as well.
-DragImageRef Clipboard::createDragImage(IntPoint& location) const
-{
- NSImage *result = nil;
- if (m_dragImageElement) {
- Document* document = m_dragImageElement->document();
- if (Frame* frame = document->frame()) {
- NSRect imageRect;
- NSRect elementRect;
- result = snapshotDragImage(frame, m_dragImageElement.get(), &imageRect, &elementRect);
- // Client specifies point relative to element, not the whole image, which may include child
- // layers spread out all over the place.
- location.setX(elementRect.origin.x - imageRect.origin.x + m_dragLocation.x());
- location.setY(imageRect.size.height - (elementRect.origin.y - imageRect.origin.y + m_dragLocation.y()));
- }
- } else if (m_dragImage) {
- result = m_dragImage->image()->getNSImage();
-
- location = m_dragLocation;
- location.setY([result size].height - location.y());
- }
- return result;
-}
-
-}
