Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Side by Side Diff: Source/web/DragClientImpl.cpp

Issue 517043003: Move Frame to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase past r181245 conflict Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 15 matching lines...) Expand all
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "web/DragClientImpl.h" 32 #include "web/DragClientImpl.h"
33 33
34 #include "core/clipboard/DataObject.h" 34 #include "core/clipboard/DataObject.h"
35 #include "core/clipboard/DataTransfer.h" 35 #include "core/clipboard/DataTransfer.h"
36 #include "core/frame/FrameProtector.h"
36 #include "core/frame/LocalFrame.h" 37 #include "core/frame/LocalFrame.h"
37 #include "platform/DragImage.h" 38 #include "platform/DragImage.h"
38 #include "platform/geometry/IntSize.h" 39 #include "platform/geometry/IntSize.h"
39 #include "platform/graphics/skia/NativeImageSkia.h" 40 #include "platform/graphics/skia/NativeImageSkia.h"
40 #include "public/platform/WebCommon.h" 41 #include "public/platform/WebCommon.h"
41 #include "public/platform/WebDragData.h" 42 #include "public/platform/WebDragData.h"
42 #include "public/platform/WebImage.h" 43 #include "public/platform/WebImage.h"
43 #include "public/platform/WebPoint.h" 44 #include "public/platform/WebPoint.h"
44 #include "public/web/WebDragOperation.h" 45 #include "public/web/WebDragOperation.h"
45 #include "public/web/WebViewClient.h" 46 #include "public/web/WebViewClient.h"
46 #include "web/WebViewImpl.h" 47 #include "web/WebViewImpl.h"
47 #include "wtf/Assertions.h" 48 #include "wtf/Assertions.h"
48 #include "wtf/RefPtr.h" 49 #include "wtf/RefPtr.h"
49 50
50 namespace blink { 51 namespace blink {
51 52
52 DragDestinationAction DragClientImpl::actionMaskForDrag(DragData*) 53 DragDestinationAction DragClientImpl::actionMaskForDrag(DragData*)
53 { 54 {
54 if (m_webView->client() && m_webView->client()->acceptsLoadDrops()) 55 if (m_webView->client() && m_webView->client()->acceptsLoadDrops())
55 return DragDestinationActionAny; 56 return DragDestinationActionAny;
56 57
57 return static_cast<DragDestinationAction>( 58 return static_cast<DragDestinationAction>(
58 DragDestinationActionDHTML | DragDestinationActionEdit); 59 DragDestinationActionDHTML | DragDestinationActionEdit);
59 } 60 }
60 61
61 void DragClientImpl::startDrag(DragImage* dragImage, const IntPoint& dragImageOr igin, const IntPoint& eventPos, DataTransfer* dataTransfer, LocalFrame* frame, b ool isLinkDrag) 62 void DragClientImpl::startDrag(DragImage* dragImage, const IntPoint& dragImageOr igin, const IntPoint& eventPos, DataTransfer* dataTransfer, LocalFrame* frame, b ool isLinkDrag)
62 { 63 {
63 // Add a ref to the frame just in case a load occurs mid-drag. 64 // Add a ref to the frame just in case a load occurs mid-drag.
64 RefPtr<LocalFrame> frameProtector = frame; 65 FrameProtector frameProtector(frame);
65 66
66 WebDragData dragData(dataTransfer->dataObject()); 67 WebDragData dragData(dataTransfer->dataObject());
67 WebDragOperationsMask dragOperationMask = static_cast<WebDragOperationsMask> (dataTransfer->sourceOperation()); 68 WebDragOperationsMask dragOperationMask = static_cast<WebDragOperationsMask> (dataTransfer->sourceOperation());
68 WebImage image; 69 WebImage image;
69 IntSize offsetSize(eventPos - dragImageOrigin); 70 IntSize offsetSize(eventPos - dragImageOrigin);
70 WebPoint offsetPoint(offsetSize.width(), offsetSize.height()); 71 WebPoint offsetPoint(offsetSize.width(), offsetSize.height());
71 72
72 if (dragImage) { 73 if (dragImage) {
73 float resolutionScale = dragImage->resolutionScale(); 74 float resolutionScale = dragImage->resolutionScale();
74 if (m_webView->deviceScaleFactor() != resolutionScale) { 75 if (m_webView->deviceScaleFactor() != resolutionScale) {
75 ASSERT(resolutionScale > 0); 76 ASSERT(resolutionScale > 0);
76 float scale = m_webView->deviceScaleFactor() / resolutionScale; 77 float scale = m_webView->deviceScaleFactor() / resolutionScale;
77 dragImage->scale(scale, scale); 78 dragImage->scale(scale, scale);
78 } 79 }
79 image = dragImage->bitmap(); 80 image = dragImage->bitmap();
80 } 81 }
81 82
82 m_webView->startDragging(frame, dragData, dragOperationMask, image, offsetPo int); 83 m_webView->startDragging(frame, dragData, dragOperationMask, image, offsetPo int);
83 } 84 }
84 85
85 } // namespace blink 86 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698