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

Unified Diff: Source/core/inspector/InspectorOverlay.h

Issue 430463002: DevTools: highlight page regions as paths, not quads (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: review comments addressed Created 6 years, 5 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/core/inspector/InspectorDOMAgent.cpp ('k') | Source/core/inspector/InspectorOverlay.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorOverlay.h
diff --git a/Source/core/inspector/InspectorOverlay.h b/Source/core/inspector/InspectorOverlay.h
index a8f14f18e3d5cc96eae621aaa6b31374878b2e0b..27f3dc0d05945a8765526f652a7ca5528a372c2a 100644
--- a/Source/core/inspector/InspectorOverlay.h
+++ b/Source/core/inspector/InspectorOverlay.h
@@ -48,7 +48,6 @@ class EmptyChromeClient;
class GraphicsContext;
class InspectorClient;
class InspectorOverlayHost;
-class JSONObject;
class JSONValue;
class Node;
class Page;
@@ -66,46 +65,10 @@ public:
Color border;
Color margin;
Color eventTarget;
- bool showInfo;
- bool showRulers;
- bool showExtensionLines;
-};
+ Color shape;
+ Color shapeMargin;
-enum HighlightType {
- HighlightTypeNode,
- HighlightTypeRects,
-};
-
-struct Highlight {
- Highlight()
- : type(HighlightTypeNode)
- , showRulers(false)
- {
- }
-
- void setDataFromConfig(const HighlightConfig& highlightConfig)
- {
- contentColor = highlightConfig.content;
- contentOutlineColor = highlightConfig.contentOutline;
- paddingColor = highlightConfig.padding;
- borderColor = highlightConfig.border;
- marginColor = highlightConfig.margin;
- eventTargetColor = highlightConfig.eventTarget;
- showRulers = highlightConfig.showRulers;
- showExtensionLines = highlightConfig.showExtensionLines;
- }
-
- Color contentColor;
- Color contentOutlineColor;
- Color paddingColor;
- Color borderColor;
- Color marginColor;
- Color eventTargetColor;
-
- // When the type is Node, there are 4 or 5 quads (margin, border, padding, content, optional eventTarget).
- // When the type is Rects, this is just a list of quads.
- HighlightType type;
- Vector<FloatQuad> quads;
+ bool showInfo;
bool showRulers;
bool showExtensionLines;
};
@@ -138,8 +101,7 @@ public:
void showAndHideViewSize(bool showGrid);
Node* highlightedNode() const;
- bool getBoxModel(Node*, Vector<FloatQuad>*);
- PassRefPtr<TypeBuilder::DOM::ShapeOutsideInfo> buildObjectForShapeOutside(Node*);
+ bool getBoxModel(Node*, RefPtr<TypeBuilder::DOM::BoxModel>&);
void freePage();
« no previous file with comments | « Source/core/inspector/InspectorDOMAgent.cpp ('k') | Source/core/inspector/InspectorOverlay.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698