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

Side by Side Diff: third_party/WebKit/WebCore/page/chromium/EventHandlerChromium.cpp

Issue 39293: WebKit merge 41447:41498 [third_party/WebKit] (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: remove CRLF Created 11 years, 9 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
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 * Copyright (C) 2008 Google Inc. 3 * Copyright (C) 2008 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 page->focusController()->setFocusedFrame(m_frame); 141 page->focusController()->setFocusedFrame(m_frame);
142 } 142 }
143 143
144 bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget) 144 bool EventHandler::passWidgetMouseDownEventToWidget(RenderWidget* renderWidget)
145 { 145 {
146 return passMouseDownEventToWidget(renderWidget->widget()); 146 return passMouseDownEventToWidget(renderWidget->widget());
147 } 147 }
148 148
149 unsigned EventHandler::accessKeyModifiers() 149 unsigned EventHandler::accessKeyModifiers()
150 { 150 {
151 #if PLATFORM(DARWIN)
152 return PlatformKeyboardEvent::CtrlKey | PlatformKeyboardEvent::AltKey;
153 #else
151 return PlatformKeyboardEvent::AltKey; 154 return PlatformKeyboardEvent::AltKey;
155 #endif
152 } 156 }
153 157
154 } // namespace WebCore 158 } // namespace WebCore
OLDNEW
« no previous file with comments | « third_party/WebKit/WebCore/page/Page.h ('k') | third_party/WebKit/WebCore/platform/ContextMenu.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698