Chromium Code Reviews| Index: Source/core/inspector/InspectorOverlay.cpp |
| diff --git a/Source/core/inspector/InspectorOverlay.cpp b/Source/core/inspector/InspectorOverlay.cpp |
| index 6687bbe8e7321884ec3702b02050fb757c685fe4..a87bacdb7d79593863a61654516d00d477f76c39 100644 |
| --- a/Source/core/inspector/InspectorOverlay.cpp |
| +++ b/Source/core/inspector/InspectorOverlay.cpp |
| @@ -111,7 +111,7 @@ protected: |
| virtual FloatPoint translatePoint(const FloatPoint& point) |
| { |
| FloatPoint rendererPoint = m_shapeOutsideInfo.shapeToRendererPoint(point); |
| - return m_view.contentsToRootView(roundedIntPoint(m_renderer.localToAbsolute(rendererPoint))); |
| + return m_view.contentsToRootFrame(roundedIntPoint(m_renderer.localToAbsolute(rendererPoint))); |
| } |
| private: |
| @@ -239,10 +239,11 @@ private: |
| static void contentsQuadToScreen(const FrameView* view, FloatQuad& quad) |
| { |
| - quad.setP1(view->contentsToRootView(roundedIntPoint(quad.p1()))); |
| - quad.setP2(view->contentsToRootView(roundedIntPoint(quad.p2()))); |
| - quad.setP3(view->contentsToRootView(roundedIntPoint(quad.p3()))); |
| - quad.setP4(view->contentsToRootView(roundedIntPoint(quad.p4()))); |
| + // TODO: These look like they should be RootFrame, dgozman to confirm |
|
dgozman
2015/02/18 14:05:58
Situation here depends on whether WebPageOverlay i
bokan
2015/02/18 14:10:45
The WebPageOverlay is the highlights and size anno
|
| + quad.setP1(view->contentsToRootFrame(roundedIntPoint(quad.p1()))); |
| + quad.setP2(view->contentsToRootFrame(roundedIntPoint(quad.p2()))); |
| + quad.setP3(view->contentsToRootFrame(roundedIntPoint(quad.p3()))); |
| + quad.setP4(view->contentsToRootFrame(roundedIntPoint(quad.p4()))); |
| } |
| static bool buildNodeQuads(LayoutObject* renderer, FloatQuad* content, FloatQuad* padding, FloatQuad* border, FloatQuad* margin) |
| @@ -830,7 +831,7 @@ bool InspectorOverlay::getBoxModel(Node* node, RefPtr<TypeBuilder::DOM::BoxModel |
| if (!buildNodeQuads(node->renderer(), &content, &padding, &border, &margin)) |
| return false; |
| - IntRect boundingBox = pixelSnappedIntRect(view->contentsToRootView(renderer->absoluteBoundingBoxRect())); |
| + IntRect boundingBox = pixelSnappedIntRect(view->contentsToRootFrame(renderer->absoluteBoundingBoxRect())); |
| RenderBoxModelObject* modelObject = renderer->isBoxModelObject() ? toRenderBoxModelObject(renderer) : nullptr; |
| model = TypeBuilder::DOM::BoxModel::create() |