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

Side by Side Diff: webkit/port/page/chromium/EventHandlerChromium.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
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/webkit/port/page/EventHandlerWin.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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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 #include "EventHandler.h" 27 #include "EventHandler.h"
28 28
29 #include "ClipboardWin.h"
30 #include "Cursor.h" 29 #include "Cursor.h"
31 #include "FloatPoint.h" 30 #include "FloatPoint.h"
32 #include "FocusController.h" 31 #include "FocusController.h"
33 #include "FrameView.h" 32 #include "FrameView.h"
34 #include "Frame.h" 33 #include "Frame.h"
35 #include "HitTestRequest.h" 34 #include "HitTestRequest.h"
36 #include "HitTestResult.h" 35 #include "HitTestResult.h"
37 #include "MouseEventWithHitTestResults.h" 36 #include "MouseEventWithHitTestResults.h"
38 #include "Page.h" 37 #include "Page.h"
39 #include "PlatformKeyboardEvent.h" 38 #include "PlatformKeyboardEvent.h"
40 #include "PlatformScrollBar.h" 39 #include "PlatformScrollBar.h"
41 #include "PlatformWheelEvent.h" 40 #include "PlatformWheelEvent.h"
42 #include "RenderWidget.h" 41 #include "RenderWidget.h"
43 #include "SelectionController.h" 42 #include "SelectionController.h"
43 #include "NotImplemented.h"
44
45 #if PLATFORM(WIN)
46 #include "ClipboardWin.h"
44 #include "WCDataObject.h" 47 #include "WCDataObject.h"
45 #include "NotImplemented.h" 48 #endif
46 49
47 namespace WebCore { 50 namespace WebCore {
48 51
49 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey; 52 unsigned EventHandler::s_accessKeyModifiers = PlatformKeyboardEvent::AltKey;
50 53
51 const double EventHandler::TextDragDelay = 0.0; 54 const double EventHandler::TextDragDelay = 0.0;
52 55
53 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& m ev, Frame* subframe) 56 bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& m ev, Frame* subframe)
54 { 57 {
55 // If we're clicking into a frame that is selected, the frame will appear 58 // If we're clicking into a frame that is selected, the frame will appear
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 132
130 bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const 133 bool EventHandler::eventActivatedView(const PlatformMouseEvent& event) const
131 { 134 {
132 // TODO(darin): Apple's EventHandlerWin.cpp does the following: 135 // TODO(darin): Apple's EventHandlerWin.cpp does the following:
133 // return event.activatedWebView(); 136 // return event.activatedWebView();
134 return false; 137 return false;
135 } 138 }
136 139
137 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const 140 PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
138 { 141 {
142 #if PLATFORM(WIN)
139 COMPtr<WCDataObject> dataObject; 143 COMPtr<WCDataObject> dataObject;
140 WCDataObject::createInstance(&dataObject); 144 WCDataObject::createInstance(&dataObject);
141 return ClipboardWin::create(true, dataObject.get(), ClipboardWritable); 145 return ClipboardWin::create(true, dataObject.get(), ClipboardWritable);
146 #else
147 return PassRefPtr<Clipboard>(0);
148 #endif
142 } 149 }
143 150
144 void EventHandler::focusDocumentView() 151 void EventHandler::focusDocumentView()
145 { 152 {
146 Page* page = m_frame->page(); 153 Page* page = m_frame->page();
147 if (!page) 154 if (!page)
148 return; 155 return;
149 page->focusController()->setFocusedFrame(m_frame); 156 page->focusController()->setFocusedFrame(m_frame);
150 } 157 }
151 158
152 bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) 159 bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
153 { 160 {
154 return passMouseDownEventToWidget(renderWidget->widget()); 161 return passMouseDownEventToWidget(renderWidget->widget());
155 } 162 }
156 163
157 } 164 }
OLDNEW
« no previous file with comments | « webkit/port/page/chromium/DragControllerChromium.cpp ('k') | webkit/port/page/chromium/FrameChromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698