Devtools: Create layout editor experiment

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 80 matching lines @@
 
 using namespace HTMLNames;
 
 namespace DOMAgentState {
 static const char domAgentEnabled[] = "domAgentEnabled";
 };
 
 static const size_t maxTextSize = 10000;
 static const UChar ellipsisUChar[] = { 0x2026, 0 };
 
-static Color parseColor(const RefPtr<JSONObject>* colorObject)
-{
-    if (!colorObject || !(*colorObject))
-        return Color::transparent;
-
-    int r;
-    int g;
-    int b;
-    bool success = (*colorObject)->getNumber("r", &r);
-    success |= (*colorObject)->getNumber("g", &g);
-    success |= (*colorObject)->getNumber("b", &b);
-    if (!success)
-        return Color::transparent;
-
-    double a;
-    success = (*colorObject)->getNumber("a", &a);
-    if (!success)
-        return Color(r, g, b);
-
-    // Clamp alpha to the [0..1] range.
-    if (a < 0)
-        a = 0;
-    else if (a > 1)
-        a = 1;
-
-    return Color(r, g, b, static_cast<int>(a * 255));
-}
-
-static Color parseConfigColor(const String& fieldName, JSONObject* configObject)
-{
-    const RefPtr<JSONObject> colorObject = configObject->getObject(fieldName);
-    return parseColor(&colorObject);
-}
-
 static bool parseQuad(const RefPtr<JSONArray>& quadArray, FloatQuad* quad)
 {
     if (!quadArray)
         return false;
     const size_t coordinatesInQuad = 8;
     double coordinates[coordinatesInQuad];
     if (quadArray->length() != coordinatesInQuad)
         return false;
     for (size_t i = 0; i < coordinatesInQuad; ++i) {
         if (!quadArray->get(i)->asNumber(coordinates + i))
@@ skipping 1078 matching lines @@
         hideHighlight(errorString);
     }
 }
 
 PassOwnPtr<InspectorHighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, JSONObject* highlightInspectorObject)
 {
     if (!highlightInspectorObject) {
         *errorString = "Internal error: highlight configuration parameter is missing";
         return nullptr;
     }
-
-    OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
-    bool showInfo = false; // Default: false (do not show a tooltip).
-    highlightInspectorObject->getBoolean("showInfo", &showInfo);
-    highlightConfig->showInfo = showInfo;
-    bool showRulers = false; // Default: false (do not show rulers).
-    highlightInspectorObject->getBoolean("showRulers", &showRulers);
-    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();
+    return InspectorHighlight::highlightConfigFromInspectorObject(highlightInspectorObject);
 }
 
 void InspectorDOMAgent::setInspectModeEnabled(ErrorString* errorString, bool enabled, const bool* inspectUAShadowDOM, const RefPtr<JSONObject>* highlightConfig)
 {
     if (enabled && !pushDocumentUponHandlelessOperation(errorString))
         return;
     SearchMode searchMode = enabled ? (asBool(inspectUAShadowDOM) ? SearchingForUAShadow : SearchingForNormal) : NotSearching;
     setSearchingForNode(errorString, searchMode, highlightConfig ? highlightConfig->get() : nullptr);
 }
 
 void InspectorDOMAgent::highlightRect(ErrorString*, int x, int y, int width, int height, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor)
 {
     OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad(FloatRect(x, y, width, height)));
     innerHighlightQuad(quad.release(), color, outlineColor);
 }
 
 void InspectorDOMAgent::highlightQuad(ErrorString* errorString, const RefPtr<JSONArray>& quadArray, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor)
 {
     OwnPtr<FloatQuad> quad = adoptPtr(new FloatQuad());
     if (!parseQuad(quadArray, quad.get())) {
         *errorString = "Invalid Quad format";
         return;
     }
     innerHighlightQuad(quad.release(), color, outlineColor);
 }
 
 void InspectorDOMAgent::innerHighlightQuad(PassOwnPtr<FloatQuad> quad, const RefPtr<JSONObject>* color, const RefPtr<JSONObject>* outlineColor)
 {
-    OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
-    highlightConfig->content = parseColor(color);
-    highlightConfig->contentOutline = parseColor(outlineColor);
+    OwnPtr<InspectorHighlightConfig> highlightConfig = InspectorHighlight::highlightConfigWithColors(color, outlineColor);
     m_overlay->highlightQuad(quad, *highlightConfig);
 }
 
 void InspectorDOMAgent::highlightNode(ErrorString* errorString, const RefPtr<JSONObject>& highlightInspectorObject, const int* nodeId, const int* backendNodeId, const String* objectId)
 {
     Node* node = nullptr;
     if (nodeId) {
         node = assertNode(errorString, *nodeId);
     } else if (backendNodeId) {
         node = DOMNodeIds::nodeForId(*backendNodeId);
@@ skipping 17 matching lines @@
 
 void InspectorDOMAgent::highlightFrame(
     ErrorString*,
     const String& frameId,
     const RefPtr<JSONObject>* color,
     const RefPtr<JSONObject>* outlineColor)
 {
     LocalFrame* frame = m_pageAgent->frameForId(frameId);
     // FIXME: Inspector doesn't currently work cross process.
     if (frame && frame->deprecatedLocalOwner()) {
-        OwnPtr<InspectorHighlightConfig> highlightConfig = adoptPtr(new InspectorHighlightConfig());
+        OwnPtr<InspectorHighlightConfig> highlightConfig = InspectorHighlight::highlightConfigWithColors(color, outlineColor);
         highlightConfig->showInfo = true; // Always show tooltips for frames.
-        highlightConfig->content = parseColor(color);
-        highlightConfig->contentOutline = parseColor(outlineColor);
         m_overlay->highlightNode(frame->deprecatedLocalOwner(), 0 /* eventTarget */, *highlightConfig, false);
     }
 }
 
 void InspectorDOMAgent::hideHighlight(ErrorString*)
 {
     m_overlay->hideHighlight();
 }
 
 void InspectorDOMAgent::copyTo(ErrorString* errorString, int nodeId, int targetElementId, const int* const anchorNodeId, int* newNodeId)
@@ skipping 854 matching lines @@
     visitor->trace(m_searchResults);
 #endif
     visitor->trace(m_hoveredNodeForInspectMode);
     visitor->trace(m_history);
     visitor->trace(m_domEditor);
     visitor->trace(m_listener);
     InspectorBaseAgent::trace(visitor);
 }
 
 } // namespace blink