Merge 133885 - Web Inspector: Add option to disable rulers (Elements panel)

Source/WebCore/inspector/InspectorOverlay.cpp

 /*
  * 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 91 matching lines @@
 }
 
 static void buildNodeHighlight(Node* node, const HighlightConfig& highlightConfig, Highlight* highlight)
 {
     RenderObject* renderer = node->renderer();
     Frame* containingFrame = node->document()->frame();
 
     if (!renderer || !containingFrame)
         return;
 
-    highlight->setColors(highlightConfig);
+    highlight->setDataFromConfig(highlightConfig);
     FrameView* containingView = containingFrame->view();
     FrameView* mainView = containingFrame->page()->mainFrame()->view();
     IntRect boundingBox = pixelSnappedIntRect(containingView->contentsToRootView(renderer->absoluteBoundingBoxRect()));
     boundingBox.move(mainView->scrollOffset());
     IntRect titleAnchorBox = boundingBox;
 
     // RenderSVGRoot should be highlighted through the isBox() code path, all other SVG elements should just dump their absoluteQuads().
 #if ENABLE(SVG)
     bool isSVGRenderer = renderer->node() && renderer->node()->isSVGElement() && !renderer->isSVGRoot();
 #else
@@ skipping 56 matching lines @@
         highlight->quads.append(absBorderQuad);
         highlight->quads.append(absPaddingQuad);
         highlight->quads.append(absContentQuad);
     }
 }
 
 static void buildRectHighlight(Page* page, IntRect* rect, const HighlightConfig& highlightConfig, Highlight *highlight)
 {
     if (!page)
         return;
-    highlight->setColors(highlightConfig);
+    highlight->setDataFromConfig(highlightConfig);
     FloatRect highlightRect(*rect);
     highlight->type = HighlightTypeRects;
     highlight->quads.append(highlightRect);
 }
 
 } // anonymous namespace
 
 InspectorOverlay::InspectorOverlay(Page* page, InspectorClient* client)
     : m_page(page)
     , m_client(client)
@@ skipping 129 matching lines @@
     return array.release();
 }
 
 static PassRefPtr<InspectorObject> buildObjectForHighlight(FrameView* mainView, const Highlight& highlight)
 {
     RefPtr<InspectorObject> object = InspectorObject::create();
     RefPtr<InspectorArray> array = InspectorArray::create();
     for (size_t i = 0; i < highlight.quads.size(); ++i)
         array->pushArray(buildArrayForQuad(highlight.quads[i]));
     object->setArray("quads", array.release());
+    object->setBoolean("showRulers", highlight.showRulers);
     object->setString("contentColor", highlight.contentColor.serialized());
     object->setString("contentOutlineColor", highlight.contentOutlineColor.serialized());
     object->setString("paddingColor", highlight.paddingColor.serialized());
     object->setString("borderColor", highlight.borderColor.serialized());
     object->setString("marginColor", highlight.marginColor.serialized());
 
     FloatRect visibleRect = mainView->visibleContentRect();
     if (!mainView->delegatesScrolling()) {
         object->setNumber("scrollX", visibleRect.x());
         object->setNumber("scrollY", visibleRect.y());
@@ skipping 161 matching lines @@
     info.addMember(m_nodeHighlightConfig);
     info.addMember(m_highlightRect);
     info.addMember(m_overlayPage);
     info.addMember(m_rectHighlightConfig);
     info.addMember(m_size);
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(INSPECTOR)