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

Unified Diff: Source/WebCore/inspector/InspectorOverlay.cpp

Issue 11366221: Merge 133885 - Web Inspector: Add option to disable rulers (Elements panel) (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years, 1 month 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/WebCore/inspector/InspectorOverlay.h ('k') | Source/WebCore/inspector/InspectorOverlayPage.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/inspector/InspectorOverlay.cpp
===================================================================
--- Source/WebCore/inspector/InspectorOverlay.cpp (revision 134412)
+++ Source/WebCore/inspector/InspectorOverlay.cpp (working copy)
@@ -109,7 +109,7 @@
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()));
@@ -186,7 +186,7 @@
{
if (!page)
return;
- highlight->setColors(highlightConfig);
+ highlight->setDataFromConfig(highlightConfig);
FloatRect highlightRect(*rect);
highlight->type = HighlightTypeRects;
highlight->quads.append(highlightRect);
@@ -336,6 +336,7 @@
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());
« no previous file with comments | « Source/WebCore/inspector/InspectorOverlay.h ('k') | Source/WebCore/inspector/InspectorOverlayPage.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698