DevTools: highlight page regions as paths, not quads

Source/core/inspector/InspectorDOMAgent.cpp

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * 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
@@ skipping 1216 matching lines @@
     highlightConfig->showRulers = showRulers;
     bool showExtensionLines = false; // Default: false (do not show extension lines).
     highlightInspectorObject->getBoolean("showExtensionLines", &showExtensionLines);
     highlightConfig->showExtensionLines = showExtensionLines;
     highlightConfig->content = parseConfigColor("contentColor", highlightInspectorObject);
     highlightConfig->contentOutline = parseConfigColor("contentOutlineColor", highlightInspectorObject);
     highlightConfig->padding = parseConfigColor("paddingColor", highlightInspectorObject);
     highlightConfig->border = parseConfigColor("borderColor", highlightInspectorObject);
     highlightConfig->margin = parseConfigColor("marginColor", highlightInspectorObject);
     highlightConfig->eventTarget = parseConfigColor("eventTargetColor", highlightInspectorObject);
+    highlightConfig->shape = parseConfigColor("shapeColor", highlightInspectorObject);
+    highlightConfig->shapeMargin = parseConfigColor("shapeMarginColor", highlightInspectorObject);
+
     return highlightConfig.release();
 }
 
 void InspectorDOMAgent::setInspectModeEnabled(ErrorString* errorString, bool enabled, const bool* inspectUAShadowDOM, const RefPtr<JSONObject>* highlightConfig)
 {
     if (enabled && !pushDocumentUponHandlelessOperation(errorString))
         return;
     SearchMode searchMode = enabled ? (inspectUAShadowDOM && *inspectUAShadowDOM ? SearchingForUAShadow : SearchingForNormal) : NotSearching;
     setSearchingForNode(errorString, searchMode, highlightConfig ? highlightConfig->get() : 0);
 }
@@ skipping 176 matching lines @@
         String path;
         if (!(*iter)->asString(&path)) {
             *errorString = "Files must be strings";
             return;
         }
         fileList->append(File::create(path));
     }
     toHTMLInputElement(node)->setFiles(fileList);
 }
 
-static RefPtr<TypeBuilder::Array<double> > buildArrayForQuad(const FloatQuad& quad)
-{
-    RefPtr<TypeBuilder::Array<double> > array = TypeBuilder::Array<double>::create();
-    array->addItem(quad.p1().x());
-    array->addItem(quad.p1().y());
-    array->addItem(quad.p2().x());
-    array->addItem(quad.p2().y());
-    array->addItem(quad.p3().x());
-    array->addItem(quad.p3().y());
-    array->addItem(quad.p4().x());
-    array->addItem(quad.p4().y());
-    return array.release();
-}
-
 void InspectorDOMAgent::getBoxModel(ErrorString* errorString, int nodeId, RefPtr<TypeBuilder::DOM::BoxModel>& model)
 {
     Node* node = assertNode(errorString, nodeId);
     if (!node)
         return;
 
-    Vector<FloatQuad> quads;
-    bool isInlineOrBox = m_overlay->getBoxModel(node, &quads);
-    if (!isInlineOrBox) {
+    bool result = m_overlay->getBoxModel(node, model);
+    if (!result)
         *errorString = "Could not compute box model.";
-        return;
-    }
 
-    RenderObject* renderer = node->renderer();
-    LocalFrame* frame = node->document().frame();
-    FrameView* view = frame->view();
-
-    IntRect boundingBox = pixelSnappedIntRect(view->contentsToRootView(renderer->absoluteBoundingBoxRect()));
-    RenderBoxModelObject* modelObject = renderer->isBoxModelObject() ? toRenderBoxModelObject(renderer) : 0;
-    RefPtr<TypeBuilder::DOM::ShapeOutsideInfo> shapeOutsideInfo = m_overlay->buildObjectForShapeOutside(node);
-
-    model = TypeBuilder::DOM::BoxModel::create()
-        .setContent(buildArrayForQuad(quads.at(3)))
-        .setPadding(buildArrayForQuad(quads.at(2)))
-        .setBorder(buildArrayForQuad(quads.at(1)))
-        .setMargin(buildArrayForQuad(quads.at(0)))
-        .setWidth(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), modelObject) : boundingBox.width())
-        .setHeight(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), modelObject) : boundingBox.height());
-    if (shapeOutsideInfo)
-        model->setShapeOutside(shapeOutsideInfo);
 }
 
 void InspectorDOMAgent::getNodeForLocation(ErrorString* errorString, int x, int y, int* nodeId)
 {
     if (!pushDocumentUponHandlelessOperation(errorString))
         return;
     HitTestRequest request(HitTestRequest::Move | HitTestRequest::ReadOnly | HitTestRequest::AllowChildFrameContent);
     HitTestResult result(IntPoint(x, y));
     m_document->frame()->contentRenderer()->hitTest(request, result);
     Node* node = result.innerPossiblyPseudoNode();
@@ skipping 706 matching lines @@
     visitor->trace(m_searchResults);
 #endif
     visitor->trace(m_history);
     visitor->trace(m_domEditor);
     visitor->trace(m_listener);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink