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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 1322053002: Devtools: Move inspectMode logic from InspectorDomAgent to InspectorOverlayImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Address comments Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 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 2065 matching lines...) Expand 10 before | Expand all | Expand 10 after
2076 2076
2077 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii()); 2077 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii());
2078 // If we've started a drag and drop operation, ignore input events until 2078 // If we've started a drag and drop operation, ignore input events until
2079 // we're done. 2079 // we're done.
2080 if (m_doingDragAndDrop) 2080 if (m_doingDragAndDrop)
2081 return true; 2081 return true;
2082 2082
2083 if (m_devToolsEmulator->handleInputEvent(inputEvent)) 2083 if (m_devToolsEmulator->handleInputEvent(inputEvent))
2084 return true; 2084 return true;
2085 2085
2086 WebDevToolsAgentImpl* devTools = mainFrameDevToolsAgentImpl();
2087 if (devTools && devTools->handleInputEvent(inputEvent))
2088 return true;
2089
2090 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { 2086 if (InspectorOverlayImpl* overlay = inspectorOverlay()) {
2091 if (overlay->handleInputEvent(inputEvent)) 2087 if (overlay->handleInputEvent(inputEvent))
2092 return true; 2088 return true;
2093 } 2089 }
2094 2090
2095 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. 2091 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately.
2096 if (m_ignoreInputEvents) 2092 if (m_ignoreInputEvents)
2097 return false; 2093 return false;
2098 2094
2099 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent); 2095 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent);
(...skipping 2325 matching lines...) Expand 10 before | Expand all | Expand 10 after
4425 if (m_pageColorOverlay) 4421 if (m_pageColorOverlay)
4426 m_pageColorOverlay->update(); 4422 m_pageColorOverlay->update();
4427 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { 4423 if (InspectorOverlayImpl* overlay = inspectorOverlay()) {
4428 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4424 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4429 if (inspectorPageOverlay) 4425 if (inspectorPageOverlay)
4430 inspectorPageOverlay->update(); 4426 inspectorPageOverlay->update();
4431 } 4427 }
4432 } 4428 }
4433 4429
4434 } // namespace blink 4430 } // namespace blink
OLDNEW
« Source/web/InspectorOverlayImpl.cpp ('K') | « Source/web/WebFrameWidgetImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698