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

Unified Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)
Patch Set: rebased bad merge Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
index fe976466ae0b2ff3f3e91d42f7b8f12331eecd26..90915e706702cf90fe30029db5614a119d7034c2 100644
--- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
+++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
@@ -67,7 +67,7 @@
#include "web/CompositorMutatorImpl.h"
#include "web/CompositorWorkerProxyClientImpl.h"
#include "web/ContextMenuAllowedScope.h"
-#include "web/InspectorOverlay.h"
+#include "web/InspectorOverlayAgent.h"
#include "web/PageOverlay.h"
#include "web/WebDevToolsAgentImpl.h"
#include "web/WebInputEventConversion.h"
@@ -251,7 +251,7 @@ void WebFrameWidgetImpl::UpdateAllLifecyclePhases() {
if (!local_root_)
return;
- if (InspectorOverlay* overlay = GetInspectorOverlay()) {
+ if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
overlay->UpdateAllLifecyclePhases();
// TODO(chrishtr): integrate paint into the overlay's lifecycle.
if (overlay->GetPageOverlay() &&
@@ -363,7 +363,7 @@ WebInputEventResult WebFrameWidgetImpl::HandleInputEvent(
if (!GetPage())
return WebInputEventResult::kNotHandled;
- if (InspectorOverlay* overlay = GetInspectorOverlay()) {
+ if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
if (overlay->HandleInputEvent(input_event))
return WebInputEventResult::kHandledSuppressed;
}
@@ -1181,11 +1181,11 @@ HitTestResult WebFrameWidgetImpl::HitTestResultForRootFramePos(
return result;
}
-InspectorOverlay* WebFrameWidgetImpl::GetInspectorOverlay() {
+InspectorOverlayAgent* WebFrameWidgetImpl::GetInspectorOverlay() {
if (!local_root_)
return nullptr;
if (WebDevToolsAgentImpl* devtools = local_root_->DevToolsAgentImpl())
- return devtools->Overlay();
+ return devtools->OverlayAgent();
return nullptr;
}
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698