Use V8TRYCATCH_FOR_V8STRINGRESOURCE() macro instead of toCoreStringWithUndefinedOrNullCheck()

Source/bindings/v8/ScriptDebugServer.cpp

 /*
  * Copyright (c) 2010-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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 280 matching lines @@
             if (normalResult->IsObject())
                 *result = ScriptObject(ScriptState::current(), normalResult->ToObject());
             // Call stack may have changed after if the edited function was on the stack.
             if (!preview && isPaused())
                 *newCallFrames = currentCallFrames();
             return true;
         }
     // Compile error.
     case 1:
         {
+            V8StringResource<WithUndefinedOrNullCheck> message(resultTuple->Get(2));
+            if (!message.prepare()) {
+                *error = "Unknown error.";
+                return false;
+            }
             RefPtr<TypeBuilder::Debugger::SetScriptSourceError::CompileError> compileError =
                 TypeBuilder::Debugger::SetScriptSourceError::CompileError::create()
-                    .setMessage(toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
+                    .setMessage(message)

[pfeldman, 2013/12/12 16:11:24]

Same here, we know it is a string. See
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

                     .setLineNumber(resultTuple->Get(3)->ToInteger()->Value())
                     .setColumnNumber(resultTuple->Get(4)->ToInteger()->Value());
 
-            *error = toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(1));
+            V8StringResource<WithUndefinedOrNullCheck> errorResource(resultTuple->Get(1));

[pfeldman, 2013/12/12 16:11:24]

ditto

+            if (!errorResource.prepare()) {
+                *error = "Unknown error.";
+                return false;
+            }
+            *error = errorResource;
             errorData = TypeBuilder::Debugger::SetScriptSourceError::create();
             errorData->setCompileError(compileError);
             return false;
         }
     }
     *error = "Unknown error.";
     return false;
 }
 
 PassRefPtr<JavaScriptCallFrame> ScriptDebugServer::wrapCallFrames(v8::Handle<v8::Object> executionState, int maximumLimit)
@@ skipping 58 matching lines @@
     if (isPaused())
         return;
 
     ScriptDebugListener* listener = getDebugListenerForContext(m_pausedContext);
     if (!listener)
         return;
 
     Vector<String> breakpointIds;
     if (!hitBreakpointNumbers.IsEmpty()) {
         breakpointIds.resize(hitBreakpointNumbers->Length());
-        for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++)
-            breakpointIds[i] = toCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
+        for (size_t i = 0; i < hitBreakpointNumbers->Length(); i++) {
+            V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, hitBreakpointNumber, hitBreakpointNumbers->Get(i));
+            breakpointIds[i] = hitBreakpointNumber;
+        }
     }
 
     m_executionState.set(m_isolate, executionState);
     ScriptState* currentCallFrameState = ScriptState::forContext(m_pausedContext);
     listener->didPause(currentCallFrameState, currentCallFrames(), ScriptValue(exception, currentCallFrameState->isolate()), breakpointIds);
 
     m_runningNestedMessageLoop = true;
     runMessageLoopOnPause(m_pausedContext);
     m_runningNestedMessageLoop = false;
 }
@@ skipping 83 matching lines @@
                 skipRequest = listener->shouldSkipStepPause(topFrame);
             if (executeSkipPauseRequest(skipRequest, eventDetails.GetExecutionState()))
                 return;
             handleProgramBreak(eventDetails, v8::Handle<v8::Value>(), hitBreakpoints.As<v8::Array>());
         }
     }
 }
 
 void ScriptDebugServer::dispatchDidParseSource(ScriptDebugListener* listener, v8::Handle<v8::Object> object)
 {
-    String sourceID = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "id")));
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, sourceID, object->Get(v8AtomicString(m_isolate, "id")));

[pfeldman, 2013/12/12 16:11:24]

These are of known types:
https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...

 
     ScriptDebugListener::Script script;
-    script.url = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "name")));
-    script.source = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "source")));
-    script.sourceMappingURL = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "sourceMappingURL")));
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, url, object->Get(v8AtomicString(m_isolate, "name")));
+    script.url = url;
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, source, object->Get(v8AtomicString(m_isolate, "source")));
+    script.source = source;
+    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<WithUndefinedOrNullCheck>, sourceMappingURL, object->Get(v8AtomicString(m_isolate, "sourceMappingURL")));
+    script.sourceMappingURL = sourceMappingURL;

[pfeldman, 2013/12/12 16:11:24]

Hm. This seems NULL. Adding vsevik for this.

     script.startLine = object->Get(v8AtomicString(m_isolate, "startLine"))->ToInteger()->Value();
     script.startColumn = object->Get(v8AtomicString(m_isolate, "startColumn"))->ToInteger()->Value();
     script.endLine = object->Get(v8AtomicString(m_isolate, "endLine"))->ToInteger()->Value();
     script.endColumn = object->Get(v8AtomicString(m_isolate, "endColumn"))->ToInteger()->Value();
     script.isContentScript = object->Get(v8AtomicString(m_isolate, "isContentScript"))->ToBoolean()->Value();
 
     listener->didParseSource(sourceID, script);
 }
 
 void ScriptDebugServer::ensureDebuggerScriptCompiled()
@@ skipping 110 matching lines @@
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(Frame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore