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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2517653003: Drag-and-drop across OOPIFs. (Closed)
Patch Set: Created 4 years, 1 month 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) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 view->invalidateRect(damagedRect); 319 view->invalidateRect(damagedRect);
320 } 320 }
321 321
322 const WebInputEvent* WebFrameWidgetImpl::m_currentInputEvent = nullptr; 322 const WebInputEvent* WebFrameWidgetImpl::m_currentInputEvent = nullptr;
323 323
324 WebInputEventResult WebFrameWidgetImpl::handleInputEvent( 324 WebInputEventResult WebFrameWidgetImpl::handleInputEvent(
325 const WebInputEvent& inputEvent) { 325 const WebInputEvent& inputEvent) {
326 TRACE_EVENT1("input", "WebFrameWidgetImpl::handleInputEvent", "type", 326 TRACE_EVENT1("input", "WebFrameWidgetImpl::handleInputEvent", "type",
327 WebInputEvent::GetName(inputEvent.type)); 327 WebInputEvent::GetName(inputEvent.type));
328 328
329 // If a drag-and-drop operation is in progress, ignore input events.
330 if (m_doingDragAndDrop)
331 return WebInputEventResult::HandledSuppressed;
332
329 // Don't handle events once we've started shutting down. 333 // Don't handle events once we've started shutting down.
330 if (!page()) 334 if (!page())
331 return WebInputEventResult::NotHandled; 335 return WebInputEventResult::NotHandled;
332 336
333 if (InspectorOverlay* overlay = inspectorOverlay()) { 337 if (InspectorOverlay* overlay = inspectorOverlay()) {
334 if (overlay->handleInputEvent(inputEvent)) 338 if (overlay->handleInputEvent(inputEvent))
335 return WebInputEventResult::HandledSuppressed; 339 return WebInputEventResult::HandledSuppressed;
336 } 340 }
337 341
338 // Report the event to be NOT processed by WebKit, so that the browser can 342 // Report the event to be NOT processed by WebKit, so that the browser can
(...skipping 807 matching lines...) Expand 10 before | Expand all | Expand 10 after
1146 return nullptr; 1150 return nullptr;
1147 } 1151 }
1148 1152
1149 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { 1153 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const {
1150 if (!m_imeAcceptEvents) 1154 if (!m_imeAcceptEvents)
1151 return nullptr; 1155 return nullptr;
1152 return focusedLocalFrameInWidget(); 1156 return focusedLocalFrameInWidget();
1153 } 1157 }
1154 1158
1155 } // namespace blink 1159 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetBase.cpp ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698