Changeset 57064 in webkit
- Timestamp:
- Apr 4, 2010 11:30:04 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 9 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r57061 r57064 1 2010-04-04 Pavel Feldman <pfeldman@chromium.org> 2 3 Not reviewed. Rolling out chromium changes r57028 and r57032 4 for breaking chromium layout tests. 5 6 * WebCore.gyp/WebCore.gyp: 7 * WebCore.gypi: 8 * platform/chromium/DragImageChromium.cpp: Added. 9 (WebCore::dragImageSize): 10 (WebCore::deleteDragImage): 11 (WebCore::scaleDragImage): 12 (WebCore::dissolveDragImageToFraction): 13 (WebCore::createDragImageFromImage): 14 (WebCore::createDragImageIconForCachedImage): 15 * platform/chromium/DragImageChromiumMac.cpp: Removed. 16 * platform/chromium/DragImageChromiumSkia.cpp: Removed. 17 * platform/chromium/DragImageRef.h: 18 1 19 2010-03-29 Antonio Gomes <tonikitoo@webkit.org> 2 20 -
trunk/WebCore/WebCore.gyp/WebCore.gyp
r57028 r57064 1065 1065 '../platform/image-decoders/xbm/XBMImageDecoder.cpp', 1066 1066 '../platform/image-decoders/xbm/XBMImageDecoder.h', 1067 1068 # Again, Skia is not used on Mac.1069 '../platform/chromium/DragImageChromiumSkia.cpp',1070 1067 ], 1071 1068 'direct_dependent_settings': { -
trunk/WebCore/WebCore.gypi
r57045 r57064 1952 1952 'platform/chromium/DragDataChromium.cpp', 1953 1953 'platform/chromium/DragDataRef.h', 1954 'platform/chromium/DragImageChromiumMac.cpp', 1955 'platform/chromium/DragImageChromiumSkia.cpp', 1954 'platform/chromium/DragImageChromium.cpp', 1956 1955 'platform/chromium/DragImageRef.h', 1957 1956 'platform/chromium/FileChooserChromium.cpp', -
trunk/WebCore/platform/chromium/DragImageChromium.cpp
-
Property
svn:eol-style
set to
LF
r57063 r57064 1 1 /* 2 * Copyright (c) 20 10, Google Inc. All rights reserved.2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 52 52 return 0; 53 53 } 54 54 55 55 DragImageRef dissolveDragImageToFraction(DragImageRef image, float) 56 56 { … … 58 58 return image; 59 59 } 60 60 61 61 DragImageRef createDragImageFromImage(Image* img) 62 { 62 { 63 63 notImplemented(); 64 64 return 0; 65 65 } 66 66 67 67 DragImageRef createDragImageIconForCachedImage(CachedImage*) 68 68 { 69 69 notImplemented(); 70 return 0; 70 return 0; 71 71 } 72 72 73 73 } // namespace WebCore -
Property
svn:eol-style
set to
-
trunk/WebCore/platform/chromium/DragImageRef.h
r57028 r57064 30 30 #define DragImageRef_h 31 31 32 class SkBitmap;33 34 32 namespace WebCore { 35 33 36 #if OS(DARWIN) 37 // FIXME: not implemented. 38 typedef void* DragImageRef; 39 #else 40 typedef SkBitmap* DragImageRef; 41 #endif 34 // FIXME: Need to support image drag-n-drop. For now, we just allow things 35 // to compile by defining this dummy type. 36 typedef void* DragImageRef; 42 37 43 38 } // namespace WebCore -
trunk/WebKit/chromium/ChangeLog
r57046 r57064 1 2010-04-04 Pavel Feldman <pfeldman@chromium.org> 2 3 Not reviewed. Rolling out chromium changes r57028 and r57032 4 for breaking chromium layout tests. 5 6 * public/WebViewClient.h: 7 (WebKit::WebViewClient::startDragging): 8 * src/DragClientImpl.cpp: 9 (WebKit::DragClientImpl::startDrag): 10 * src/WebViewImpl.cpp: 11 (WebKit::WebViewImpl::startDragging): 12 * src/WebViewImpl.h: 13 1 14 2010-04-03 Darin Fisher <darin@chromium.org> 2 15 -
trunk/WebKit/chromium/public/WebViewClient.h
r57028 r57064 49 49 class WebFrame; 50 50 class WebGeolocationService; 51 class WebImage;52 51 class WebNode; 53 52 class WebNotificationPresenter; … … 226 225 // Called when a drag-n-drop operation should begin. 227 226 virtual void startDragging( 228 const Web DragData&, WebDragOperationsMask, const WebImage&, const WebPoint&) { }227 const WebPoint& from, const WebDragData&, WebDragOperationsMask) { } 229 228 230 229 // Called to determine if drag-n-drop operations may initiate a page -
trunk/WebKit/chromium/src/DragClientImpl.cpp
r57028 r57064 31 31 #include "config.h" 32 32 #include "DragClientImpl.h" 33 #include "DragImageRef.h" 33 34 34 #include "ChromiumDataObject.h" 35 35 #include "ClipboardChromium.h" 36 36 #include "Frame.h" 37 #include "NativeImageSkia.h"38 #include "WebCommon.h"39 37 #include "WebDragData.h" 40 #include "WebImage.h"41 38 #include "WebViewClient.h" 42 39 #include "WebViewImpl.h" … … 85 82 DragOperation dragOperationMask = clipboard->sourceOperation(); 86 83 87 IntSize offsetSize(eventPos - dragImageOrigin);88 WebPoint offsetPoint(offsetSize.width(), offsetSize.height());89 #if WEBKIT_USING_SKIA90 84 m_webView->startDragging( 91 dragData, static_cast<WebDragOperationsMask>(dragOperationMask), 92 WebImage(*dragImage), offsetPoint); 93 #else 94 // FIXME: When DragImageRef is implemented for CG, we can probably just remove 95 // this #if fork. For now, pass an empty image. 96 m_webView->startDragging( 97 dragData, static_cast<WebDragOperationsMask>(dragOperationMask), 98 WebImage(), WebPoint()); 99 #endif 85 eventPos, dragData, static_cast<WebDragOperationsMask>(dragOperationMask)); 100 86 } 101 87 -
trunk/WebKit/chromium/src/WebViewImpl.cpp
r57028 r57064 88 88 #include "WebDragData.h" 89 89 #include "WebFrameImpl.h" 90 #include "WebImage.h"91 90 #include "WebInputEvent.h" 92 91 #include "WebInputEventConversion.h" … … 1934 1933 } 1935 1934 1936 void WebViewImpl::startDragging(const WebDragData& dragData, 1937 WebDragOperationsMask mask, 1938 const WebImage& dragImage, 1939 const WebPoint& dragImageOffset) 1935 void WebViewImpl::startDragging(const WebPoint& eventPos, 1936 const WebDragData& dragData, 1937 WebDragOperationsMask mask) 1940 1938 { 1941 1939 if (!m_client) … … 1943 1941 ASSERT(!m_doingDragAndDrop); 1944 1942 m_doingDragAndDrop = true; 1945 m_client->startDragging( dragData, mask, dragImage, dragImageOffset);1943 m_client->startDragging(eventPos, dragData, mask); 1946 1944 } 1947 1945 -
trunk/WebKit/chromium/src/WebViewImpl.h
r57028 r57064 75 75 class WebDevToolsAgentPrivate; 76 76 class WebFrameImpl; 77 class WebImage;78 77 class WebKeyboardEvent; 79 78 class WebMouseEvent; … … 276 275 // Start a system drag and drop operation. 277 276 void startDragging( 277 const WebPoint& eventPos, 278 278 const WebDragData& dragData, 279 WebDragOperationsMask mask, 280 const WebImage& dragImage, 281 const WebPoint& dragImageOffset); 279 WebDragOperationsMask dragSourceOperationMask); 282 280 283 281 void suggestionsPopupDidHide()
Note: See TracChangeset
for help on using the changeset viewer.