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

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

Issue 1355563003: Devtools: Rename InspectorOverlayImpl to InspectorOverlay (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/web.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "public/web/WebTextInputInfo.h" 148 #include "public/web/WebTextInputInfo.h"
149 #include "public/web/WebViewClient.h" 149 #include "public/web/WebViewClient.h"
150 #include "public/web/WebWindowFeatures.h" 150 #include "public/web/WebWindowFeatures.h"
151 #include "web/CompositionUnderlineVectorBuilder.h" 151 #include "web/CompositionUnderlineVectorBuilder.h"
152 #include "web/ContextFeaturesClientImpl.h" 152 #include "web/ContextFeaturesClientImpl.h"
153 #include "web/ContextMenuAllowedScope.h" 153 #include "web/ContextMenuAllowedScope.h"
154 #include "web/DatabaseClientImpl.h" 154 #include "web/DatabaseClientImpl.h"
155 #include "web/DevToolsEmulator.h" 155 #include "web/DevToolsEmulator.h"
156 #include "web/FullscreenController.h" 156 #include "web/FullscreenController.h"
157 #include "web/GraphicsLayerFactoryChromium.h" 157 #include "web/GraphicsLayerFactoryChromium.h"
158 #include "web/InspectorOverlayImpl.h" 158 #include "web/InspectorOverlay.h"
159 #include "web/LinkHighlightImpl.h" 159 #include "web/LinkHighlightImpl.h"
160 #include "web/PageOverlay.h" 160 #include "web/PageOverlay.h"
161 #include "web/PrerendererClientImpl.h" 161 #include "web/PrerendererClientImpl.h"
162 #include "web/ResizeViewportAnchor.h" 162 #include "web/ResizeViewportAnchor.h"
163 #include "web/RotationViewportAnchor.h" 163 #include "web/RotationViewportAnchor.h"
164 #include "web/SpeechRecognitionClientProxy.h" 164 #include "web/SpeechRecognitionClientProxy.h"
165 #include "web/StorageQuotaClientImpl.h" 165 #include "web/StorageQuotaClientImpl.h"
166 #include "web/ValidationMessageClientImpl.h" 166 #include "web/ValidationMessageClientImpl.h"
167 #include "web/ViewportAnchor.h" 167 #include "web/ViewportAnchor.h"
168 #include "web/WebDevToolsAgentImpl.h" 168 #include "web/WebDevToolsAgentImpl.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 { 490 {
491 ASSERT(!m_page); 491 ASSERT(!m_page);
492 } 492 }
493 493
494 WebDevToolsAgentImpl* WebViewImpl::mainFrameDevToolsAgentImpl() 494 WebDevToolsAgentImpl* WebViewImpl::mainFrameDevToolsAgentImpl()
495 { 495 {
496 WebLocalFrameImpl* mainFrame = mainFrameImpl(); 496 WebLocalFrameImpl* mainFrame = mainFrameImpl();
497 return mainFrame ? mainFrame->devToolsAgentImpl() : nullptr; 497 return mainFrame ? mainFrame->devToolsAgentImpl() : nullptr;
498 } 498 }
499 499
500 InspectorOverlayImpl* WebViewImpl::inspectorOverlay() 500 InspectorOverlay* WebViewImpl::inspectorOverlay()
501 { 501 {
502 if (WebDevToolsAgentImpl* devtools = mainFrameDevToolsAgentImpl()) 502 if (WebDevToolsAgentImpl* devtools = mainFrameDevToolsAgentImpl())
503 return static_cast<InspectorOverlayImpl*>(devtools->overlay()); 503 return static_cast<InspectorOverlay*>(devtools->overlay());
dgozman 2015/09/22 03:07:36 Remove the cast.
sergeyv 2015/09/22 16:55:38 Done.
504 return nullptr; 504 return nullptr;
505 } 505 }
506 506
507 WebLocalFrameImpl* WebViewImpl::mainFrameImpl() 507 WebLocalFrameImpl* WebViewImpl::mainFrameImpl()
508 { 508 {
509 return m_page && m_page->mainFrame() && m_page->mainFrame()->isLocalFrame() ? WebLocalFrameImpl::fromFrame(m_page->deprecatedLocalMainFrame()) : 0; 509 return m_page && m_page->mainFrame() && m_page->mainFrame()->isLocalFrame() ? WebLocalFrameImpl::fromFrame(m_page->deprecatedLocalMainFrame()) : 0;
510 } 510 }
511 511
512 bool WebViewImpl::tabKeyCyclesThroughElements() const 512 bool WebViewImpl::tabKeyCyclesThroughElements() const
513 { 513 {
(...skipping 1380 matching lines...) Expand 10 before | Expand all | Expand 10 after
1894 } 1894 }
1895 1895
1896 void WebViewImpl::layout() 1896 void WebViewImpl::layout()
1897 { 1897 {
1898 TRACE_EVENT0("blink", "WebViewImpl::layout"); 1898 TRACE_EVENT0("blink", "WebViewImpl::layout");
1899 if (!mainFrameImpl()) 1899 if (!mainFrameImpl())
1900 return; 1900 return;
1901 1901
1902 PageWidgetDelegate::layout(*m_page, *mainFrameImpl()->frame()); 1902 PageWidgetDelegate::layout(*m_page, *mainFrameImpl()->frame());
1903 updateLayerTreeBackgroundColor(); 1903 updateLayerTreeBackgroundColor();
1904 if (InspectorOverlayImpl* overlay = inspectorOverlay()) 1904 if (InspectorOverlay* overlay = inspectorOverlay())
1905 overlay->layout(); 1905 overlay->layout();
1906 for (size_t i = 0; i < m_linkHighlights.size(); ++i) 1906 for (size_t i = 0; i < m_linkHighlights.size(); ++i)
1907 m_linkHighlights[i]->updateGeometry(); 1907 m_linkHighlights[i]->updateGeometry();
1908 1908
1909 if (FrameView* view = mainFrameImpl()->frameView()) { 1909 if (FrameView* view = mainFrameImpl()->frameView()) {
1910 LocalFrame* frame = mainFrameImpl()->frame(); 1910 LocalFrame* frame = mainFrameImpl()->frame();
1911 1911
1912 if (m_shouldDispatchFirstVisuallyNonEmptyLayout && view->isVisuallyNonEm pty()) { 1912 if (m_shouldDispatchFirstVisuallyNonEmptyLayout && view->isVisuallyNonEm pty()) {
1913 m_shouldDispatchFirstVisuallyNonEmptyLayout = false; 1913 m_shouldDispatchFirstVisuallyNonEmptyLayout = false;
1914 // TODO(esprehn): Move users of this callback to something 1914 // TODO(esprehn): Move users of this callback to something
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
2079 2079
2080 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii()); 2080 TRACE_EVENT1("input", "WebViewImpl::handleInputEvent", "type", inputTypeToNa me(inputEvent.type).ascii());
2081 // If we've started a drag and drop operation, ignore input events until 2081 // If we've started a drag and drop operation, ignore input events until
2082 // we're done. 2082 // we're done.
2083 if (m_doingDragAndDrop) 2083 if (m_doingDragAndDrop)
2084 return true; 2084 return true;
2085 2085
2086 if (m_devToolsEmulator->handleInputEvent(inputEvent)) 2086 if (m_devToolsEmulator->handleInputEvent(inputEvent))
2087 return true; 2087 return true;
2088 2088
2089 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { 2089 if (InspectorOverlay* overlay = inspectorOverlay()) {
2090 if (overlay->handleInputEvent(inputEvent)) 2090 if (overlay->handleInputEvent(inputEvent))
2091 return true; 2091 return true;
2092 } 2092 }
2093 2093
2094 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. 2094 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately.
2095 if (m_ignoreInputEvents) 2095 if (m_ignoreInputEvents)
2096 return false; 2096 return false;
2097 2097
2098 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent); 2098 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent);
2099 UIEventWithKeyState::clearNewTabModifierSetFromIsolatedWorld(); 2099 UIEventWithKeyState::clearNewTabModifierSetFromIsolatedWorld();
(...skipping 2330 matching lines...) Expand 10 before | Expand all | Expand 10 after
4430 4430
4431 void WebViewImpl::forceNextDrawingBufferCreationToFail() 4431 void WebViewImpl::forceNextDrawingBufferCreationToFail()
4432 { 4432 {
4433 DrawingBuffer::forceNextDrawingBufferCreationToFail(); 4433 DrawingBuffer::forceNextDrawingBufferCreationToFail();
4434 } 4434 }
4435 4435
4436 void WebViewImpl::updatePageOverlays() 4436 void WebViewImpl::updatePageOverlays()
4437 { 4437 {
4438 if (m_pageColorOverlay) 4438 if (m_pageColorOverlay)
4439 m_pageColorOverlay->update(); 4439 m_pageColorOverlay->update();
4440 if (InspectorOverlayImpl* overlay = inspectorOverlay()) { 4440 if (InspectorOverlay* overlay = inspectorOverlay()) {
4441 PageOverlay* inspectorPageOverlay = overlay->pageOverlay(); 4441 PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
4442 if (inspectorPageOverlay) 4442 if (inspectorPageOverlay)
4443 inspectorPageOverlay->update(); 4443 inspectorPageOverlay->update();
4444 } 4444 }
4445 } 4445 }
4446 4446
4447 } // namespace blink 4447 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698