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

Side by Side Diff: webkit/port/page/chromium/FrameChromium.cpp

Issue 7419: Move many files that were suffixed Win.cpp to Chromium.cpp, and place them in... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 12 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « webkit/port/page/chromium/FrameChromium.h ('k') | webkit/port/page/win/FrameWin.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/bridge/FrameWin.cpp:r69-2775
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 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 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #if USE(JSC) 27 #if USE(JSC)
28 #include "runtime.h" 28 #include "runtime.h"
29 #elif USE(V8) 29 #elif USE(V8)
30 #include "npruntime_priv.h" 30 #include "npruntime_priv.h"
31 #endif 31 #endif
32 #include "FrameWin.h" 32 #include "FrameChromium.h"
33 33
34 #include "AffineTransform.h" 34 #include "AffineTransform.h"
35 #include "FloatRect.h" 35 #include "FloatRect.h"
36 #include "Document.h" 36 #include "Document.h"
37 #include "FramePrivate.h" 37 #include "FramePrivate.h"
38 #include "RenderView.h" 38 #include "RenderView.h"
39 #include "Settings.h" 39 #include "Settings.h"
40 40
41 using std::min; 41 using std::min;
42 42
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 96
97 DragImageRef Frame::dragImageForSelection() 97 DragImageRef Frame::dragImageForSelection()
98 { 98 {
99 if (selection()->isRange()) 99 if (selection()->isRange())
100 return 0; // TODO(pkasting): http://b/119669 Implement me! 100 return 0; // TODO(pkasting): http://b/119669 Implement me!
101 101
102 return 0; 102 return 0;
103 } 103 }
104 104
105 } // namespace WebCore 105 } // namespace WebCore
OLDNEW
« no previous file with comments | « webkit/port/page/chromium/FrameChromium.h ('k') | webkit/port/page/win/FrameWin.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698