DevTools: highlight page regions as paths, not quads

Source/core/inspector/InspectorOverlay.h

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 30 matching lines @@
 #include "wtf/Vector.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Color;
 class EmptyChromeClient;
 class GraphicsContext;
 class InspectorClient;
 class InspectorOverlayHost;
-class JSONObject;
 class JSONValue;
 class Node;
 class Page;
 class PlatformGestureEvent;
 class PlatformKeyboardEvent;
 class PlatformMouseEvent;
 class PlatformTouchEvent;
 
 struct HighlightConfig {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     Color content;
     Color contentOutline;
     Color padding;
     Color border;
     Color margin;
     Color eventTarget;
+    Color shape;
+    Color shapeMargin;
+
     bool showInfo;
     bool showRulers;
     bool showExtensionLines;
 };
-
-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 showRulers;
-    bool showExtensionLines;
-};
 
 class InspectorOverlay {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<InspectorOverlay> create(Page* page, InspectorClient* client)
     {
         return adoptPtr(new InspectorOverlay(page, client));
     }
 
     ~InspectorOverlay();
 
     void update();
     void hide();
     void paint(GraphicsContext&);
     void drawOutline(GraphicsContext*, const LayoutRect&, const Color&);
     bool handleGestureEvent(const PlatformGestureEvent&);
     bool handleMouseEvent(const PlatformMouseEvent&);
     bool handleTouchEvent(const PlatformTouchEvent&);
     bool handleKeyboardEvent(const PlatformKeyboardEvent&);
 
     void setPausedInDebuggerMessage(const String*);
     void setInspectModeEnabled(bool);
 
     void hideHighlight();
     void highlightNode(Node*, Node* eventTarget, const HighlightConfig&, bool omitTooltip);
     void highlightQuad(PassOwnPtr<FloatQuad>, const HighlightConfig&);
     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();
 
     InspectorOverlayHost* overlayHost() const { return m_overlayHost.get(); }
 
     void startedRecordingProfile();
     void finishedRecordingProfile() { m_activeProfilerCount--; }
 
     // Methods supporting underlying overlay page.
     void invalidate();
@@ skipping 29 matching lines @@
     bool m_drawViewSizeWithGrid;
     bool m_omitTooltip;
     Timer<InspectorOverlay> m_timer;
     int m_activeProfilerCount;
 };
 
 } // namespace blink
 
 
 #endif // InspectorOverlay_h