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

Unified Diff: Source/web/InspectorOverlayImpl.cpp

Issue 1206833003: Devtools[LayoutEditor]: Pass data about property change from InspectorOverlayPage (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Address pfeldman's comment Created 5 years, 6 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 | « Source/web/InspectorOverlayImpl.h ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/InspectorOverlayImpl.cpp
diff --git a/Source/web/InspectorOverlayImpl.cpp b/Source/web/InspectorOverlayImpl.cpp
index 3845661139a00460cfb68d79f9c338205c3cf0bb..25008ffac7ab4e7137d46c4e79ff44c1607358d7 100644
--- a/Source/web/InspectorOverlayImpl.cpp
+++ b/Source/web/InspectorOverlayImpl.cpp
@@ -109,6 +109,7 @@ public:
void suspendUpdates() override { }
void resumeUpdates() override { }
void clear() override { }
+ void setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor>) override { }
};
DEFINE_TRACE(InspectorOverlayStub)
@@ -135,7 +136,7 @@ InspectorOverlayImpl::InspectorOverlayImpl(WebViewImpl* webViewImpl)
, m_suspendCount(0)
, m_updating(false)
{
- m_overlayHost->setListener(this);
+ m_overlayHost->setDebuggerListener(this);
}
InspectorOverlayImpl::~InspectorOverlayImpl()
@@ -177,8 +178,9 @@ void InspectorOverlayImpl::invalidate()
bool InspectorOverlayImpl::handleInputEvent(const WebInputEvent& inputEvent)
{
+ bool handled = false;
if (isEmpty())
- return false;
+ return handled;
if (WebInputEvent::isGestureEventType(inputEvent.type) && inputEvent.type == WebInputEvent::GestureTap) {
// Only let GestureTab in (we only need it and we know PlatformGestureEventBuilder supports it).
@@ -189,11 +191,11 @@ bool InspectorOverlayImpl::handleInputEvent(const WebInputEvent& inputEvent)
// PlatformMouseEventBuilder does not work with MouseEnter type, so we filter it out manually.
PlatformMouseEvent mouseEvent = PlatformMouseEventBuilder(m_webViewImpl->mainFrameImpl()->frameView(), static_cast<const WebMouseEvent&>(inputEvent));
if (mouseEvent.type() == PlatformEvent::MouseMoved)
- overlayMainFrame()->eventHandler().handleMouseMoveEvent(mouseEvent);
+ handled = overlayMainFrame()->eventHandler().handleMouseMoveEvent(mouseEvent);
if (mouseEvent.type() == PlatformEvent::MousePressed)
- overlayMainFrame()->eventHandler().handleMousePressEvent(mouseEvent);
+ handled = overlayMainFrame()->eventHandler().handleMousePressEvent(mouseEvent);
if (mouseEvent.type() == PlatformEvent::MouseReleased)
- overlayMainFrame()->eventHandler().handleMouseReleaseEvent(mouseEvent);
+ handled = overlayMainFrame()->eventHandler().handleMouseReleaseEvent(mouseEvent);
}
if (WebInputEvent::isTouchEventType(inputEvent.type)) {
PlatformTouchEvent touchEvent = PlatformTouchEventBuilder(m_webViewImpl->mainFrameImpl()->frameView(), static_cast<const WebTouchEvent&>(inputEvent));
@@ -204,8 +206,7 @@ bool InspectorOverlayImpl::handleInputEvent(const WebInputEvent& inputEvent)
overlayMainFrame()->eventHandler().keyEvent(keyboardEvent);
}
- // Overlay should not consume events.
- return false;
+ return handled;
}
void InspectorOverlayImpl::setPausedInDebuggerMessage(const String* message)
@@ -222,10 +223,11 @@ void InspectorOverlayImpl::setInspectModeEnabled(bool enabled)
void InspectorOverlayImpl::hideHighlight()
{
+ if (m_layoutEditor)
+ m_layoutEditor->setNode(nullptr);
m_highlightNode.clear();
m_eventTargetNode.clear();
m_highlightQuad.clear();
- m_layoutEditor.clear();
update();
}
@@ -233,8 +235,8 @@ void InspectorOverlayImpl::highlightNode(Node* node, Node* eventTarget, const In
{
m_nodeHighlightConfig = highlightConfig;
m_highlightNode = node;
- if (highlightConfig.showLayoutEditor)
- m_layoutEditor = LayoutEditor::create(node);
+ if (m_layoutEditor && highlightConfig.showLayoutEditor)
+ m_layoutEditor->setNode(node);
m_eventTargetNode = eventTarget;
m_omitTooltip = omitTooltip;
update();
@@ -484,4 +486,11 @@ void InspectorOverlayImpl::resumeUpdates()
--m_suspendCount;
}
+void InspectorOverlayImpl::setLayoutEditor(PassOwnPtrWillBeRawPtr<LayoutEditor> layoutEditor)
+{
+ m_layoutEditor = layoutEditor;
+ m_overlayHost->setLayoutEditorListener(m_layoutEditor.get());
+}
+
+
} // namespace blink
« no previous file with comments | « Source/web/InspectorOverlayImpl.h ('k') | Source/web/WebDevToolsAgentImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698