<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165510] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165510">165510</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-12 16:37:23 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: OS X View Indication
https://bugs.webkit.org/show_bug.cgi?id=130119
Reviewed by Timothy Hatcher.
* inspector/InspectorController.cpp:
(WebCore::InspectorController::setIndicating):
OS X will handles this in the InspectorOverlay. iOS does not use the
overlay, so it handles this in the client (already implemented).
* inspector/InspectorOverlay.h:
Remove unused m_size, and add a boolean for the indicating state.
* inspector/InspectorOverlay.cpp:
(WebCore::InspectorOverlay::InspectorOverlay):
(WebCore::InspectorOverlay::shouldShowOverlay):
Helper for determining if we should show the overlay or not.
(WebCore::InspectorOverlay::setIndicating):
Set the state and trigger an overlay update.
(WebCore::InspectorOverlay::paint):
(WebCore::InspectorOverlay::update):
(WebCore::InspectorOverlay::drawGutter):
(WebCore::InspectorOverlay::evaluateInOverlay):
Simplification of existing methods.
* inspector/InspectorOverlayPage.css:
(.indicate):
Give the page a blue tint, matching the node highlight color.
* inspector/InspectorOverlayPage.js:
(showPageIndication):
(hidePageIndication):
Add / remove a body style class.
(drawNodeHighlight):
Remove unused parameters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorControllercpp">trunk/Source/WebCore/inspector/InspectorController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayh">trunk/Source/WebCore/inspector/InspectorOverlay.h</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayPagecss">trunk/Source/WebCore/inspector/InspectorOverlayPage.css</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlayPagejs">trunk/Source/WebCore/inspector/InspectorOverlayPage.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2014-03-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: OS X View Indication
+ https://bugs.webkit.org/show_bug.cgi?id=130119
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InspectorController.cpp:
+ (WebCore::InspectorController::setIndicating):
+ OS X will handles this in the InspectorOverlay. iOS does not use the
+ overlay, so it handles this in the client (already implemented).
+
+ * inspector/InspectorOverlay.h:
+ Remove unused m_size, and add a boolean for the indicating state.
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::InspectorOverlay::InspectorOverlay):
+ (WebCore::InspectorOverlay::shouldShowOverlay):
+ Helper for determining if we should show the overlay or not.
+
+ (WebCore::InspectorOverlay::setIndicating):
+ Set the state and trigger an overlay update.
+
+ (WebCore::InspectorOverlay::paint):
+ (WebCore::InspectorOverlay::update):
+ (WebCore::InspectorOverlay::drawGutter):
+ (WebCore::InspectorOverlay::evaluateInOverlay):
+ Simplification of existing methods.
+
+ * inspector/InspectorOverlayPage.css:
+ (.indicate):
+ Give the page a blue tint, matching the node highlight color.
+
+ * inspector/InspectorOverlayPage.js:
+ (showPageIndication):
+ (hidePageIndication):
+ Add / remove a body style class.
+
+ (drawNodeHighlight):
+ Remove unused parameters.
+
+2014-03-12 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Disable REMOTE_INSPECTOR in earlier OS X releases
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130118
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorController.cpp (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorController.cpp 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/inspector/InspectorController.cpp 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -370,11 +370,14 @@
</span><span class="cx">
</span><span class="cx"> void InspectorController::setIndicating(bool indicating)
</span><span class="cx"> {
</span><del>- // FIXME: For non-iOS clients, we should have InspectorOverlay do something here.
</del><ins>+#if !PLATFORM(IOS)
+ m_overlay->setIndicating(indicating);
+#else
</ins><span class="cx"> if (indicating)
</span><span class="cx"> m_inspectorClient->indicate();
</span><span class="cx"> else
</span><span class="cx"> m_inspectorClient->hideIndication();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InspectorController::profilerEnabled() const
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -236,6 +236,7 @@
</span><span class="cx"> InspectorOverlay::InspectorOverlay(Page& page, InspectorClient* client)
</span><span class="cx"> : m_page(page)
</span><span class="cx"> , m_client(client)
</span><ins>+ , m_indicating(false)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,8 +246,9 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::paint(GraphicsContext& context)
</span><span class="cx"> {
</span><del>- if (m_pausedInDebuggerMessage.isNull() && !m_highlightNode && !m_highlightQuad && m_size.isEmpty())
</del><ins>+ if (!shouldShowOverlay())
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> FrameView* view = overlayPage()->mainFrame().view();
</span><span class="cx"> view->updateLayoutAndStyleIfNeededRecursive();
</span><span class="lines">@@ -311,9 +313,26 @@
</span><span class="cx"> m_client->didSetSearchingForNode(enabled);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorOverlay::setIndicating(bool indicating)
+{
+ m_indicating = indicating;
+
+ if (m_indicating)
+ evaluateInOverlay(ASCIILiteral("showPageIndication"));
+ else
+ evaluateInOverlay(ASCIILiteral("hidePageIndication"));
+
+ update();
+}
+
+bool InspectorOverlay::shouldShowOverlay() const
+{
+ return m_highlightNode || m_highlightNode || m_indicating || !m_pausedInDebuggerMessage.isNull();
+}
+
</ins><span class="cx"> void InspectorOverlay::update()
</span><span class="cx"> {
</span><del>- if (!m_highlightNode && !m_highlightQuad && m_pausedInDebuggerMessage.isNull() && m_size.isEmpty()) {
</del><ins>+ if (!shouldShowOverlay()) {
</ins><span class="cx"> m_client->hideHighlight();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -325,13 +344,13 @@
</span><span class="cx"> FrameView* overlayView = overlayPage()->mainFrame().view();
</span><span class="cx"> IntSize viewportSize = view->visibleContentRect().size();
</span><span class="cx"> IntSize frameViewFullSize = view->visibleContentRectIncludingScrollbars().size();
</span><del>- IntSize size = m_size.isEmpty() ? frameViewFullSize : m_size;
</del><span class="cx"> overlayPage()->setPageScaleFactor(m_page.pageScaleFactor(), IntPoint());
</span><del>- size.scale(m_page.pageScaleFactor());
- overlayView->resize(size);
</del><ins>+ frameViewFullSize.scale(m_page.pageScaleFactor());
+ overlayView->resize(frameViewFullSize);
</ins><span class="cx">
</span><span class="cx"> // Clear canvas and paint things.
</span><del>- reset(viewportSize, m_size.isEmpty() ? IntSize() : frameViewFullSize);
</del><ins>+ // FIXME: Remove extra parameter?
+ reset(viewportSize, IntSize());
</ins><span class="cx">
</span><span class="cx"> // Include scrollbars to avoid masking them by the gutter.
</span><span class="cx"> drawGutter();
</span><span class="lines">@@ -481,7 +500,7 @@
</span><span class="cx">
</span><span class="cx"> void InspectorOverlay::drawGutter()
</span><span class="cx"> {
</span><del>- evaluateInOverlay("drawGutter", "");
</del><ins>+ evaluateInOverlay("drawGutter");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<InspectorArray> buildObjectForRendererFragments(RenderObject* renderer, const HighlightConfig& config)
</span><span class="lines">@@ -797,6 +816,13 @@
</span><span class="cx"> evaluateInOverlay("reset", resetData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorOverlay::evaluateInOverlay(const String& method)
+{
+ RefPtr<InspectorArray> command = InspectorArray::create();
+ command->pushString(method);
+ overlayPage()->mainFrame().script().evaluate(ScriptSourceCode(makeString("dispatch(", command->toJSONString(), ")")));
+}
+
</ins><span class="cx"> void InspectorOverlay::evaluateInOverlay(const String& method, const String& argument)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorArray> command = InspectorArray::create();
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.h (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.h 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.h 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -121,16 +121,20 @@
</span><span class="cx">
</span><span class="cx"> void didSetSearchingForNode(bool enabled);
</span><span class="cx">
</span><ins>+ void setIndicating(bool indicating);
+
</ins><span class="cx"> PassRefPtr<Inspector::InspectorObject> buildObjectForHighlightedNode() const;
</span><span class="cx">
</span><span class="cx"> void freePage();
</span><span class="cx"> private:
</span><ins>+ bool shouldShowOverlay() const;
</ins><span class="cx"> void drawGutter();
</span><span class="cx"> void drawNodeHighlight();
</span><span class="cx"> void drawQuadHighlight();
</span><span class="cx"> void drawPausedInDebuggerMessage();
</span><span class="cx"> Page* overlayPage();
</span><span class="cx"> void reset(const IntSize& viewportSize, const IntSize& frameViewFullSize);
</span><ins>+ void evaluateInOverlay(const String& method);
</ins><span class="cx"> void evaluateInOverlay(const String& method, const String& argument);
</span><span class="cx"> void evaluateInOverlay(const String& method, PassRefPtr<Inspector::InspectorValue> argument);
</span><span class="cx">
</span><span class="lines">@@ -142,7 +146,7 @@
</span><span class="cx"> std::unique_ptr<FloatQuad> m_highlightQuad;
</span><span class="cx"> std::unique_ptr<Page> m_overlayPage;
</span><span class="cx"> HighlightConfig m_quadHighlightConfig;
</span><del>- IntSize m_size;
</del><ins>+ bool m_indicating;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayPagecss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.css (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlayPage.css 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.css 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -26,6 +26,10 @@
</span><span class="cx"> left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.indicate {
+ background-color: rgba(111, 168, 220, 0.66) !important;
+}
+
</ins><span class="cx"> .dimmed {
</span><span class="cx"> background-color: rgba(0, 0, 0, 0.31);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlayPagejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlayPage.js (165509 => 165510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2014-03-12 23:37:20 UTC (rev 165509)
+++ trunk/Source/WebCore/inspector/InspectorOverlayPage.js 2014-03-12 23:37:23 UTC (rev 165510)
</span><span class="lines">@@ -636,16 +636,26 @@
</span><span class="cx"> _drawRulers(highlight, rulerAtRight, rulerAtBottom);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function showPageIndication()
+{
+ document.body.classList.add("indicate");
+}
+
+function hidePageIndication()
+{
+ document.body.classList.remove("indicate");
+}
+
</ins><span class="cx"> function drawNodeHighlight(highlight)
</span><span class="cx"> {
</span><span class="cx"> context.save();
</span><span class="cx"> context.translate(-highlight.scroll.x, -highlight.scroll.y);
</span><span class="cx">
</span><span class="cx"> for (var i = 0; i < highlight.fragments.length; ++i)
</span><del>- _drawFragmentHighlight(highlight.fragments[i], highlight);
</del><ins>+ _drawFragmentHighlight(highlight.fragments[i]);
</ins><span class="cx">
</span><span class="cx"> if (highlight.elementInfo && highlight.elementInfo.regionFlowInfo)
</span><del>- _drawRegionsHighlight(highlight.elementInfo.regionFlowInfo.regions, highlight);
</del><ins>+ _drawRegionsHighlight(highlight.elementInfo.regionFlowInfo.regions);
</ins><span class="cx">
</span><span class="cx"> if (highlight.elementInfo && highlight.elementInfo.shapeOutsideInfo)
</span><span class="cx"> _drawShapeHighlight(highlight.elementInfo.shapeOutsideInfo);
</span></span></pre>
</div>
</div>
</body>
</html>