Diff
Modified: trunk/Source/WebCore/ChangeLog (154225 => 154226)
--- trunk/Source/WebCore/ChangeLog 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/ChangeLog 2013-08-17 14:39:44 UTC (rev 154226)
@@ -1,5 +1,26 @@
2013-08-17 Darin Adler <[email protected]>
+ <https://webkit.org/b/119940> Rename Clipboard::m_dragLoc to m_dragLocation
+
+ Reviewed by Andreas Kling.
+
+ * dom/Clipboard.h: Removed unused dragLocation member function.
+ Renamed m_dragLoc to m_dragLocation.
+
+ * dom/Clipboard.cpp:
+ (WebCore::Clipboard::setDragImage):
+ * platform/gtk/ClipboardGtk.cpp:
+ (WebCore::Clipboard::createDragImage):
+ * platform/mac/ClipboardMac.mm:
+ (WebCore::Clipboard::createDragImage):
+ * platform/qt/ClipboardQt.cpp:
+ (WebCore::Clipboard::createDragImage):
+ * platform/win/ClipboardWin.cpp:
+ (WebCore::Clipboard::createDragImage):
+ Updated for new name.
+
+2013-08-17 Darin Adler <[email protected]>
+
<https://webkit.org/b/119942> Remove unnecessary uses of Element::ownerDocument
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/dom/Clipboard.cpp (154225 => 154226)
--- trunk/Source/WebCore/dom/Clipboard.cpp 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/dom/Clipboard.cpp 2013-08-17 14:39:44 UTC (rev 154226)
@@ -390,7 +390,7 @@
else
image = 0;
- m_dragLoc = IntPoint(x, y);
+ m_dragLocation = IntPoint(x, y);
if (m_dragImageLoader && m_dragImage)
m_dragImageLoader->stopLoading(m_dragImage);
Modified: trunk/Source/WebCore/dom/Clipboard.h (154225 => 154226)
--- trunk/Source/WebCore/dom/Clipboard.h 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/dom/Clipboard.h 2013-08-17 14:39:44 UTC (rev 154226)
@@ -96,7 +96,6 @@
LEGACY_VIRTUAL ListHashSet<String> types() const LEGACY_PURE;
LEGACY_VIRTUAL PassRefPtr<FileList> files() const LEGACY_PURE;
- IntPoint dragLocation() const { return m_dragLoc; }
CachedImage* dragImage() const { return m_dragImage.get(); }
Node* dragImageElement() const { return m_dragImageElement.get(); }
@@ -163,7 +162,7 @@
ClipboardType m_clipboardType;
protected:
- IntPoint m_dragLoc;
+ IntPoint m_dragLocation;
CachedResourceHandle<CachedImage> m_dragImage;
RefPtr<Node> m_dragImageElement;
Modified: trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp (154225 => 154226)
--- trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/platform/gtk/ClipboardGtk.cpp 2013-08-17 14:39:44 UTC (rev 154226)
@@ -28,7 +28,7 @@
DragImageRef Clipboard::createDragImage(IntPoint& location) const
{
- location = m_dragLoc;
+ location = m_dragLocation;
if (m_dragImage)
return createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
Modified: trunk/Source/WebCore/platform/mac/ClipboardMac.mm (154225 => 154226)
--- trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/platform/mac/ClipboardMac.mm 2013-08-17 14:39:44 UTC (rev 154226)
@@ -52,13 +52,13 @@
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_dragLoc.x());
- location.setY(imageRect.size.height - (elementRect.origin.y - imageRect.origin.y + m_dragLoc.y()));
+ 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_dragLoc;
+ location = m_dragLocation;
location.setY([result size].height - location.y());
}
return result;
Modified: trunk/Source/WebCore/platform/qt/ClipboardQt.cpp (154225 => 154226)
--- trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/platform/qt/ClipboardQt.cpp 2013-08-17 14:39:44 UTC (rev 154226)
@@ -42,7 +42,7 @@
DragImageRef Clipboard::createDragImage(IntPoint& location) const
{
- location = m_dragLoc;
+ location = m_dragLocation;
if (m_dragImage)
return createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
Modified: trunk/Source/WebCore/platform/win/ClipboardWin.cpp (154225 => 154226)
--- trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-08-17 14:37:25 UTC (rev 154225)
+++ trunk/Source/WebCore/platform/win/ClipboardWin.cpp 2013-08-17 14:39:44 UTC (rev 154226)
@@ -46,14 +46,14 @@
if (m_dragImage) {
#if USE(CAIRO) || USE(CG)
result = createDragImageFromImage(m_dragImage->image(), ImageOrientationDescription());
- dragLocation = m_dragLoc;
+ dragLocation = m_dragLocation;
#else
notImplemented();
#endif
} else if (m_dragImageElement) {
Node* node = m_dragImageElement.get();
result = node->document()->frame()->nodeImage(node);
- dragLocation = m_dragLoc;
+ dragLocation = m_dragLocation;
}
return result;
}
