[webkit-changes] [163988] trunk/Source/JavaScriptCore

Wed, 12 Feb 2014 14:34:39 -0800

Title: [163988] trunk/Source/_javascript_Core
Revision
163988
Author
[email protected]
Date
2014-02-12 14:36:56 -0800 (Wed, 12 Feb 2014)

Log Message

Web Inspector: Cleanup _javascript_Core/inspector
https://bugs.webkit.org/show_bug.cgi?id=128662

Patch by Joseph Pecoraro <[email protected]> on 2014-02-12
Reviewed by Timothy Hatcher.

Now that the code has settled, do a cleanup pass.

* inspector/ContentSearchUtilities.cpp:
* inspector/InspectorValues.cpp:
(Inspector::InspectorValue::asObject):
(Inspector::InspectorValue::asArray):
(Inspector::InspectorValue::parseJSON):
(Inspector::InspectorObjectBase::getObject):
(Inspector::InspectorObjectBase::getArray):
(Inspector::InspectorObjectBase::get):
* inspector/ScriptCallStackFactory.cpp:
* inspector/ScriptDebugServer.cpp:
* inspector/agents/JSGlobalObjectConsoleAgent.h:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (163987 => 163988)


--- trunk/Source/_javascript_Core/ChangeLog	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-02-12 22:36:56 UTC (rev 163988)
@@ -1,3 +1,24 @@
+2014-02-12  Joseph Pecoraro  <[email protected]>
+
+        Web Inspector: Cleanup _javascript_Core/inspector
+        https://bugs.webkit.org/show_bug.cgi?id=128662
+
+        Reviewed by Timothy Hatcher.
+
+        Now that the code has settled, do a cleanup pass.
+
+        * inspector/ContentSearchUtilities.cpp:
+        * inspector/InspectorValues.cpp:
+        (Inspector::InspectorValue::asObject):
+        (Inspector::InspectorValue::asArray):
+        (Inspector::InspectorValue::parseJSON):
+        (Inspector::InspectorObjectBase::getObject):
+        (Inspector::InspectorObjectBase::getArray):
+        (Inspector::InspectorObjectBase::get):
+        * inspector/ScriptCallStackFactory.cpp:
+        * inspector/ScriptDebugServer.cpp:
+        * inspector/agents/JSGlobalObjectConsoleAgent.h:
+
 2014-02-12  Ryosuke Niwa  <[email protected]>
 
         Windows build fix attempt after r163960.

Modified: trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp (163987 => 163988)


--- trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/inspector/ContentSearchUtilities.cpp	2014-02-12 22:36:56 UTC (rev 163988)
@@ -212,6 +212,6 @@
 }
 
 } // namespace ContentSearchUtilities
-} // namespace WebCore
+} // namespace Inspector
 
 #endif // ENABLE(INSPECTOR)

Modified: trunk/Source/_javascript_Core/inspector/InspectorValues.cpp (163987 => 163988)


--- trunk/Source/_javascript_Core/inspector/InspectorValues.cpp	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/inspector/InspectorValues.cpp	2014-02-12 22:36:56 UTC (rev 163988)
@@ -332,7 +332,7 @@
 PassRefPtr<InspectorValue> buildValue(const UChar* start, const UChar* end, const UChar** valueTokenEnd, int depth)
 {
     if (depth > stackLimit)
-        return 0;
+        return nullptr;
 
     RefPtr<InspectorValue> result;
     const UChar* tokenStart;
@@ -340,7 +340,7 @@
     Token token = parseToken(start, end, &tokenStart, &tokenEnd);
     switch (token) {
     case INVALID_TOKEN:
-        return 0;
+        return nullptr;
     case NULL_TOKEN:
         result = InspectorValue::null();
         break;
@@ -354,7 +354,7 @@
         bool ok;
         double value = charactersToDouble(tokenStart, tokenEnd - tokenStart, &ok);
         if (!ok)
-            return 0;
+            return nullptr;
         result = InspectorBasicValue::create(value);
         break;
     }
@@ -362,7 +362,7 @@
         String value;
         bool ok = decodeString(tokenStart + 1, tokenEnd - 1, &value);
         if (!ok)
-            return 0;
+            return nullptr;
         result = InspectorString::create(value);
         break;
     }
@@ -373,7 +373,7 @@
         while (token != ARRAY_END) {
             RefPtr<InspectorValue> arrayNode = buildValue(start, end, &tokenEnd, depth + 1);
             if (!arrayNode)
-                return 0;
+                return nullptr;
             array->pushValue(arrayNode);
 
             // After a list value, we expect a comma or the end of the list.
@@ -383,14 +383,14 @@
                 start = tokenEnd;
                 token = parseToken(start, end, &tokenStart, &tokenEnd);
                 if (token == ARRAY_END)
-                    return 0;
+                    return nullptr;
             } else if (token != ARRAY_END) {
                 // Unexpected value after list value.  Bail out.
-                return 0;
+                return nullptr;
             }
         }
         if (token != ARRAY_END)
-            return 0;
+            return nullptr;
         result = array.release();
         break;
     }
@@ -400,20 +400,20 @@
         token = parseToken(start, end, &tokenStart, &tokenEnd);
         while (token != OBJECT_END) {
             if (token != STRING)
-                return 0;
+                return nullptr;
             String key;
             if (!decodeString(tokenStart + 1, tokenEnd - 1, &key))
-                return 0;
+                return nullptr;
             start = tokenEnd;
 
             token = parseToken(start, end, &tokenStart, &tokenEnd);
             if (token != OBJECT_PAIR_SEPARATOR)
-                return 0;
+                return nullptr;
             start = tokenEnd;
 
             RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, depth + 1);
             if (!value)
-                return 0;
+                return nullptr;
             object->setValue(key, value);
             start = tokenEnd;
 
@@ -424,21 +424,21 @@
                 start = tokenEnd;
                 token = parseToken(start, end, &tokenStart, &tokenEnd);
                  if (token == OBJECT_END)
-                    return 0;
+                    return nullptr;
             } else if (token != OBJECT_END) {
                 // Unexpected value after last object value.  Bail out.
-                return 0;
+                return nullptr;
             }
         }
         if (token != OBJECT_END)
-            return 0;
+            return nullptr;
         result = object.release();
         break;
     }
 
     default:
         // We got a token that's not a value.
-        return 0;
+        return nullptr;
     }
     *valueTokenEnd = tokenEnd;
     return result.release();
@@ -550,12 +550,12 @@
 
 PassRefPtr<InspectorObject> InspectorValue::asObject()
 {
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<InspectorArray> InspectorValue::asArray()
 {
-    return 0;
+    return nullptr;
 }
 
 PassRefPtr<InspectorValue> InspectorValue::parseJSON(const String& json)
@@ -565,7 +565,7 @@
     const UChar *tokenEnd;
     RefPtr<InspectorValue> value = buildValue(start, end, &tokenEnd, 0);
     if (!value || tokenEnd != end)
-        return 0;
+        return nullptr;
     return value.release();
 }
 
@@ -739,7 +739,7 @@
 {
     PassRefPtr<InspectorValue> value = get(name);
     if (!value)
-        return 0;
+        return nullptr;
     return value->asObject();
 }
 
@@ -747,7 +747,7 @@
 {
     PassRefPtr<InspectorValue> value = get(name);
     if (!value)
-        return 0;
+        return nullptr;
     return value->asArray();
 }
 
@@ -755,7 +755,7 @@
 {
     Dictionary::const_iterator it = m_data.find(name);
     if (it == m_data.end())
-        return 0;
+        return nullptr;
     return it->value;
 }

Modified: trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp (163987 => 163988)


--- trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/inspector/ScriptCallStackFactory.cpp	2014-02-12 22:36:56 UTC (rev 163988)
@@ -33,17 +33,14 @@
 #include "config.h"
 #include "ScriptCallStackFactory.h"
 
-#include "ArgList.h"
 #include "CallFrame.h"
 #include "JSCJSValue.h"
-#include "JSFunction.h"
 #include "JSCInlines.h"
 #include "ScriptArguments.h"
 #include "ScriptCallFrame.h"
 #include "ScriptCallStack.h"
 #include "ScriptValue.h"
 #include "StackVisitor.h"
-#include "VM.h"
 #include <wtf/RefCountedArray.h>
 #include <wtf/text/WTFString.h>
 
@@ -171,4 +168,4 @@
     return ScriptArguments::create(exec, arguments);
 }
 
-} // namespace WebCore
+} // namespace Inspector

Modified: trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp (163987 => 163988)


--- trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/inspector/ScriptDebugServer.cpp	2014-02-12 22:36:56 UTC (rev 163988)
@@ -39,13 +39,11 @@
 #include "_javascript_CallFrame.h"
 #include "ScriptValue.h"
 #include "SourceProvider.h"
-#include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/TemporaryChange.h>
 #include <wtf/text/WTFString.h>
 
 using namespace JSC;
-using namespace Inspector;
 
 namespace Inspector {

Modified: trunk/Source/_javascript_Core/inspector/agents/JSGlobalObjectConsoleAgent.h (163987 => 163988)


--- trunk/Source/_javascript_Core/inspector/agents/JSGlobalObjectConsoleAgent.h	2014-02-12 22:36:24 UTC (rev 163987)
+++ trunk/Source/_javascript_Core/inspector/agents/JSGlobalObjectConsoleAgent.h	2014-02-12 22:36:56 UTC (rev 163988)
@@ -45,7 +45,7 @@
     virtual void addInspectedNode(ErrorString*, int nodeId) override;
     virtual void addInspectedHeapObject(ErrorString*, int inspectedHeapObjectId) override;
 
-    virtual bool isWorkerAgent() const { return false; }
+    virtual bool isWorkerAgent() const override { return false; }
 };
 
 } // namespace Inspector

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to