Changeset 124769 in webkit

Timestamp:

Aug 6, 2012 7:14:24 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: a tiny refactoring of Highlighter in InspectorDOMAgent
​https://bugs.webkit.org/show_bug.cgi?id=93257

Patch by Sergey Rogulenko <​rogulenko@google.com> on 2012-08-06
Reviewed by Pavel Feldman.

Moving error string setting inside highlightConfigFromInspectorObject.

• inspector/InspectorDOMAgent.cpp:

(WebCore::InspectorDOMAgent::setSearchingForNode):
(WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
(WebCore::InspectorDOMAgent::highlightNode):

• inspector/InspectorDOMAgent.h:

(InspectorDOMAgent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDOMAgent.cpp (modified) (2 diffs)
• inspector/InspectorDOMAgent.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-06  Sergey Rogulenko  <rogulenko@google.com>
+
+        Web Inspector: a tiny refactoring of Highlighter in InspectorDOMAgent
+        https://bugs.webkit.org/show_bug.cgi?id=93257
+
+        Reviewed by Pavel Feldman.
+
+        Moving error string setting inside highlightConfigFromInspectorObject.
+
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::setSearchingForNode):
+        (WebCore::InspectorDOMAgent::highlightConfigFromInspectorObject):
+        (WebCore::InspectorDOMAgent::highlightNode):
+        * inspector/InspectorDOMAgent.h:
+        (InspectorDOMAgent):
+
 2012-08-03  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp

@@ -1006 +1006 @@
     m_searchingForNode = enabled;
     if (enabled) {
-        if (!highlightInspectorObject) {
-            *errorString = "Internal error: highlight configuration parameter is missing";
+        m_inspectModeHighlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject);
+        if (!m_inspectModeHighlightConfig)
             return;
-        }
-        m_inspectModeHighlightConfig = highlightConfigFromInspectorObject(highlightInspectorObject);
-    }
-    else {
-        ErrorString error;
-        hideHighlight(&error);
-    }
-}
-
-PassOwnPtr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(InspectorObject* highlightInspectorObject)
-{
+    } else
+        hideHighlight(errorString);
+}
+
+PassOwnPtr<HighlightConfig> InspectorDOMAgent::highlightConfigFromInspectorObject(ErrorString* errorString, InspectorObject* highlightInspectorObject)
+{
+    if (!highlightInspectorObject) {
+        *errorString = "Internal error: highlight configuration parameter is missing";
+        return nullptr;
+    }
+
     OwnPtr<HighlightConfig> highlightConfig = adoptPtr(new HighlightConfig());
     bool showInfo = false; // Default: false (do not show a tooltip).
@@ -1050 +1050 @@
     const RefPtr<InspectorObject>& highlightInspectorObject)
 {
-    if (Node* node = nodeForId(nodeId)) {
-        if (!highlightInspectorObject) {
-            *errorString = "Internal error: highlight configuration parameter is missing";
-            return;
-        }
-        OwnPtr<HighlightConfig> highlightConfig = highlightConfigFromInspectorObject(highlightInspectorObject.get());
-        m_overlay->highlightNode(node, *highlightConfig);
-    }
+    Node* node = nodeForId(nodeId);
+    if (!node)
+        return;
+
+    OwnPtr<HighlightConfig> highlightConfig = highlightConfigFromInspectorObject(errorString, highlightInspectorObject.get());
+    if (!highlightConfig)
+        return;
+
+    m_overlay->highlightNode(node, *highlightConfig);
 }
 

trunk/Source/WebCore/inspector/InspectorDOMAgent.h

@@ -203 +203 @@
 
     void setSearchingForNode(ErrorString*, bool enabled, InspectorObject* highlightConfig);
-    PassOwnPtr<HighlightConfig> highlightConfigFromInspectorObject(InspectorObject* highlightInspectorObject);
+    PassOwnPtr<HighlightConfig> highlightConfigFromInspectorObject(ErrorString*, InspectorObject* highlightInspectorObject);
 
     // Node-related methods.