Changeset 147566 in webkit

Timestamp:

Apr 3, 2013 10:30:32 AM (11 years ago)

Author:

Antoine Quint

Message:

Web Inspector: DOM.highlightRect() and DOM.highlightQuad() should allow for page coordinates
​https://bugs.webkit.org/show_bug.cgi?id=113869

Add a new "usePageCoordinates" parameter to DOM.highlightRect() and DOM.highlightQuad()
allowing to specify that the rect or quad to highlight should be converted to page
coordinates instead of using the default viewport coordinates.

Reviewed by Timothy Hatcher.

• inspector/Inspector.json:
• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::highlightRect):
(WebCore::InspectorDOMAgent::highlightQuad):
(WebCore::InspectorDOMAgent::innerHighlightQuad):
Store the "usePageCoordinates" parameter obtained from the protocol calls onto the
highlight configuration object so that it may be used within the InspectorOverlay.

• inspector/InspectorDOMAgent.h:

(InspectorDOMAgent):

• inspector/InspectorOverlay.cpp:

(WebCore::InspectorOverlay::highlightQuad):
Check the highlight configuration for the "usePageCoordinates" parameter and
apply the inverse of the page's scroll offset to the quad if it's true.

• inspector/InspectorOverlay.h:

(HighlightConfig):
(WebCore::Highlight::setDataFromConfig):
(Highlight):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/Inspector.json (modified) (2 diffs)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)
• inspector/InspectorDOMAgent.h (modified) (2 diffs)
• inspector/InspectorOverlay.cpp (modified) (1 diff)
• inspector/InspectorOverlay.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-03  Antoine Quint  <graouts@apple.com>
+
+        Web Inspector: DOM.highlightRect() and DOM.highlightQuad() should allow for page coordinates
+        https://bugs.webkit.org/show_bug.cgi?id=113869
+
+        Add a new "usePageCoordinates" parameter to DOM.highlightRect() and DOM.highlightQuad()
+        allowing to specify that the rect or quad to highlight should be converted to page
+        coordinates instead of using the default viewport coordinates.
+
+        Reviewed by Timothy Hatcher.
+
+        * inspector/Inspector.json:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::highlightRect):
+        (WebCore::InspectorDOMAgent::highlightQuad):
+        (WebCore::InspectorDOMAgent::innerHighlightQuad):
+        Store the "usePageCoordinates" parameter obtained from the protocol calls onto the
+        highlight configuration object so that it may be used within the InspectorOverlay.
+
+        * inspector/InspectorDOMAgent.h:
+        (InspectorDOMAgent):
+        * inspector/InspectorOverlay.cpp:
+        (WebCore::InspectorOverlay::highlightQuad):
+        Check the highlight configuration for the "usePageCoordinates" parameter and
+        apply the inverse of the page's scroll offset to the quad if it's true.
+
+        * inspector/InspectorOverlay.h:
+        (HighlightConfig):
+        (WebCore::Highlight::setDataFromConfig):
+        (Highlight):
+
 2013-04-03  Kangil Han  <kangil.han@samsung.com>
 

trunk/Source/WebCore/inspector/Inspector.json

@@ -1976 +1976 @@
                     { "name": "height", "type": "integer", "description": "Rectangle height" },
                     { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
-                    { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." }
+                    { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
+                    { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
                 ],
                 "description": "Highlights given rectangle. Coordinates are absolute with respect to the main frame viewport."
@@ -1985 +1986 @@
                     { "name": "quad", "$ref": "Quad", "description": "Quad to highlight" },
                     { "name": "color", "$ref": "RGBA", "optional": true, "description": "The highlight fill color (default: transparent)." },
-                    { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." }
+                    { "name": "outlineColor", "$ref": "RGBA", "optional": true, "description": "The highlight outline color (default: transparent)." },
+                    { "name": "usePageCoordinates", "type": "boolean", "optional": true, "description": "Indicates whether the provided parameters are in page coordinates or in viewport coordinates (the default)." }
                 ],
                 "description": "Highlights given quad. Coordinates are absolute with respect to the main frame viewport."

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1156 +1156 @@
 }
 
-void InspectorDOMAgent::highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor)
+void InspectorDOMAgent::highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
 {
     OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad(FloatRect(x, y, width, height)));
-    innerHighlightQuad(quad.release(), color, outlineColor);
-}
-
-void InspectorDOMAgent::highlightQuad(ErrorString* errorString, const RefPtr<InspectorArray>& quadArray, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor)
+    innerHighlightQuad(quad.release(), color, outlineColor, usePageCoordinates);
+}
+
+void InspectorDOMAgent::highlightQuad(ErrorString* errorString, const RefPtr<InspectorArray>& quadArray, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
 {
     OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad());
@@ -1169 +1169 @@
         return;
     }
-    innerHighlightQuad(quad.release(), color, outlineColor);
-}
-
-void InspectorDOMAgent::innerHighlightQuad(PassOwnPtr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor)
+    innerHighlightQuad(quad.release(), color, outlineColor, usePageCoordinates);
+}
+
+void InspectorDOMAgent::innerHighlightQuad(PassOwnPtr<FloatQuad> quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates)
 {
     OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
     highlightConfig->content = parseColor(color);
     highlightConfig->contentOutline = parseColor(outlineColor);
+    highlightConfig->usePageCoordinates = *usePageCoordinates;
     m_overlay->highlightQuad(quad, *highlightConfig);
 }

trunk/Source/WebCore/inspector/InspectorDOMAgent.h

@@ -146 +146 @@
     virtual void releaseBackendNodeIds(ErrorString*, const String& nodeGroup);
     virtual void hideHighlight(ErrorString*);
-    virtual void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor);
-    virtual void highlightQuad(ErrorString*, const RefPtr<InspectorArray>& quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor);
+    virtual void highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates);
+    virtual void highlightQuad(ErrorString*, const RefPtr<InspectorArray>& quad, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates);
     virtual void highlightNode(ErrorString*, const RefPtr<InspectorObject>& highlightConfig, const int* nodeId, const String* objectId);
     virtual void highlightFrame(ErrorString*, const String& frameId, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor);
@@ -242 +242 @@
     void discardBindings();
 
-    void innerHighlightQuad(PassOwnPtr<FloatQuad>, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor);
+    void innerHighlightQuad(PassOwnPtr<FloatQuad>, const RefPtr<InspectorObject>* color, const RefPtr<InspectorObject>* outlineColor, const bool* usePageCoordinates);
 
     InspectorPageAgent* m_pageAgent;

trunk/Source/WebCore/inspector/InspectorOverlay.cpp

@@ -260 +260 @@
 void InspectorOverlay::highlightQuad(PassOwnPtr<FloatQuad> quad, const HighlightConfig& highlightConfig)
 {
+    if (m_quadHighlightConfig.usePageCoordinates)
+        *quad -= m_page->mainFrame()->view()->scrollOffset();
+
     m_quadHighlightConfig = highlightConfig;
     m_highlightQuad = quad;

trunk/Source/WebCore/inspector/InspectorOverlay.h

@@ -60 +60 @@
     bool showInfo;
     bool showRulers;
+    bool usePageCoordinates;
 };
 
@@ -82 +83 @@
         marginColor = highlightConfig.margin;
         showRulers = highlightConfig.showRulers;
+        usePageCoordinates = highlightConfig.usePageCoordinates;
     }
 
@@ -95 +97 @@
     Vector<FloatQuad> quads;
     bool showRulers;
+    bool usePageCoordinates;
 };