Yet another Windows build fix attempt after r153978.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Aug 2013 07:08:12 +0000 (07:08 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Aug 2013 07:08:12 +0000 (07:08 +0000)
* page/win/DragControllerWin.cpp:
(WebCore::DragController::declareAndWriteDragImage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@153985 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/page/win/DragControllerWin.cpp

index c7a8973ad1a13ff10180ea4263bf27f067b03b89..017010aba9383750c29e658b61dea663602fc8a1 100644 (file)
@@ -1,3 +1,10 @@
+2013-08-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Yet another Windows build fix attempt after r153978.
+
+        * page/win/DragControllerWin.cpp:
+        (WebCore::DragController::declareAndWriteDragImage):
+
 2013-08-13  Ryosuke Niwa  <rniwa@webkit.org>
 
         Another Windows build fix attempt after r153978.
index 3ae4c6c18a8d09d5bb8f662bfc3bbb9d849fbfac..53e2636e63286ccf3b44276dafef80225004fe39 100644 (file)
@@ -30,6 +30,7 @@
 #include "DragData.h"
 #include "FrameSelection.h"
 #include "Pasteboard.h"
+#include "markup.h"
 #include "windows.h"
 #include <wtf/RefPtr.h>
 
@@ -70,16 +71,16 @@ void DragController::cleanupAfterSystemDrag()
 
 void DragController::declareAndWriteDragImage(Clipboard* clipboard, Element* element, const KURL& url, const String& label)
 {
-    Pasteboard* pasteboard = clipboard->pasteboard();
+    Pasteboard& pasteboard = clipboard->pasteboard();
 
     // FIXME: Do we really need this check?
-    if (!pasteboard->writableDataObject())
+    if (!pasteboard.writableDataObject())
         return;
 
     // Order is important here for Explorer's sake
-    pasteboard->writeURLToWritableDataObject(url, label);
-    pasteboard->writeImageToDataObject(element, url);
-    pasteboard->writeMarkup(createMarkup(element, IncludeNode, 0, ResolveAllURLs));
+    pasteboard.writeURLToWritableDataObject(url, label);
+    pasteboard.writeImageToDataObject(element, url);
+    pasteboard.writeMarkup(createMarkup(element, IncludeNode, 0, ResolveAllURLs));
 }
 
 }