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

Side by Side Diff: WebCore/platform/DragImage.cpp

Issue 3452007: Merge 67641 - 2010-09-16 Daniel Cheng <dcheng@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/517/
Patch Set: Created 10 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
« no previous file with comments | « WebCore/manual-tests/selection-drag-crash.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Apple Inc. All rights reserved. 2 * Copyright (C) 2007 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 scaley *= resizeRatio; 62 scaley *= resizeRatio;
63 } 63 }
64 64
65 return scaleDragImage(image, FloatSize(scalex, scaley)); 65 return scaleDragImage(image, FloatSize(scalex, scaley));
66 } 66 }
67 67
68 DragImageRef createDragImageForSelection(Frame* frame) 68 DragImageRef createDragImageForSelection(Frame* frame)
69 { 69 {
70 DragImageRef image = frame->dragImageForSelection(); 70 DragImageRef image = frame->dragImageForSelection();
71 if (image) 71 if (image)
72 dissolveDragImageToFraction(image, DragController::DragImageAlpha); 72 image = dissolveDragImageToFraction(image, DragController::DragImageAlph a);
73 return image; 73 return image;
74 } 74 }
75 75
76 } // namespace WebCore 76 } // namespace WebCore
77 77
78 #endif // ENABLE(DRAG_SUPPORT) 78 #endif // ENABLE(DRAG_SUPPORT)
OLDNEW
« no previous file with comments | « WebCore/manual-tests/selection-drag-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698