Rename toWebCoreString*() utility methods to toCoreString*()

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 84 matching lines @@
     info->Set(v8AtomicString(m_isolate, "columnNumber"), v8::Integer::New(scriptBreakpoint.columnNumber, debuggerContext->GetIsolate()));
     info->Set(v8AtomicString(m_isolate, "interstatementLocation"), v8Boolean(interstatementLocation, debuggerContext->GetIsolate()));
     info->Set(v8AtomicString(m_isolate, "condition"), v8String(debuggerContext->GetIsolate(), scriptBreakpoint.condition));
 
     v8::Handle<v8::Function> setBreakpointFunction = v8::Local<v8::Function>::Cast(m_debuggerScript.newLocal(m_isolate)->Get(v8AtomicString(m_isolate, "setBreakpoint")));
     v8::Handle<v8::Value> breakpointId = v8::Debug::Call(setBreakpointFunction, info);
     if (!breakpointId->IsString())
         return "";
     *actualLineNumber = info->Get(v8AtomicString(m_isolate, "lineNumber"))->Int32Value();
     *actualColumnNumber = info->Get(v8AtomicString(m_isolate, "columnNumber"))->Int32Value();
-    return toWebCoreString(breakpointId.As<v8::String>());
+    return toCoreString(breakpointId.As<v8::String>());
 }
 
 void ScriptDebugServer::removeBreakpoint(const String& breakpointId)
 {
     v8::HandleScope scope(m_isolate);
     v8::Local<v8::Context> debuggerContext = v8::Debug::GetDebugContext();
     v8::Context::Scope contextScope(debuggerContext);
 
     v8::Local<v8::Object> info = v8::Object::New();
     info->Set(v8AtomicString(m_isolate, "breakpointId"), v8String(debuggerContext->GetIsolate(), breakpointId));
@@ skipping 152 matching lines @@
 
     v8::Local<v8::Value> v8result;
     {
         EnableLiveEditScope enableLiveEditScope;
         v8::TryCatch tryCatch;
         tryCatch.SetVerbose(false);
         v8result = callDebuggerMethod("liveEditScriptSource", 3, argv);
         if (tryCatch.HasCaught()) {
             v8::Local<v8::Message> message = tryCatch.Message();
             if (!message.IsEmpty())
-                *error = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
+                *error = toCoreStringWithUndefinedOrNullCheck(message->Get());
             else
                 *error = "Unknown error.";
             return false;
         }
     }
     ASSERT(!v8result.IsEmpty());
     v8::Local<v8::Object> resultTuple = v8result->ToObject();
     int code = static_cast<int>(resultTuple->Get(0)->ToInteger()->Value());
     switch (code) {
     case 0:
         {
             v8::Local<v8::Value> normalResult = resultTuple->Get(1);
             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:
         {
             RefPtr<TypeBuilder::Debugger::SetScriptSourceError::CompileError> compileError =
                 TypeBuilder::Debugger::SetScriptSourceError::CompileError::create()
-                    .setMessage(toWebCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
+                    .setMessage(toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(2)))
                     .setLineNumber(resultTuple->Get(3)->ToInteger()->Value())
                     .setColumnNumber(resultTuple->Get(4)->ToInteger()->Value());
 
-            *error = toWebCoreStringWithUndefinedOrNullCheck(resultTuple->Get(1));
+            *error = toCoreStringWithUndefinedOrNullCheck(resultTuple->Get(1));
             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 60 matching lines @@
         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] = toWebCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
+            breakpointIds[i] = toCoreStringWithUndefinedOrNullCheck(hitBreakpointNumbers->Get(i));
     }
 
     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 = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "id")));
+    String sourceID = toCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "id")));
 
     ScriptDebugListener::Script script;
-    script.url = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "name")));
-    script.source = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "source")));
-    script.sourceMappingURL = toWebCoreStringWithUndefinedOrNullCheck(object->Get(v8AtomicString(m_isolate, "sourceMappingURL")));
+    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")));
     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 55 matching lines @@
     if (context.IsEmpty())
         return;
     v8::Context::Scope contextScope(context);
 
     v8::Handle<v8::String> source = v8String(m_isolate, expression);
     v8::TryCatch tryCatch;
     v8::Local<v8::Script> script = V8ScriptRunner::compileScript(source, sourceURL, TextPosition(), 0, m_isolate);
     if (tryCatch.HasCaught()) {
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
-            *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
+            *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
         return;
     }
     if (script.IsEmpty())
         return;
 
     *scriptId = String::number(script->GetId());
     m_compiledScripts.set(*scriptId, adoptPtr(new ScopedPersistent<v8::Script>(m_isolate, script)));
 }
 
 void ScriptDebugServer::clearCompiledScripts()
@@ skipping 17 matching lines @@
         return;
     v8::Context::Scope contextScope(context);
     v8::TryCatch tryCatch;
     v8::Local<v8::Value> value = V8ScriptRunner::runCompiledScript(script, state->executionContext(), m_isolate);
     *wasThrown = false;
     if (tryCatch.HasCaught()) {
         *wasThrown = true;
         *result = ScriptValue(tryCatch.Exception(), m_isolate);
         v8::Local<v8::Message> message = tryCatch.Message();
         if (!message.IsEmpty())
-            *exceptionMessage = toWebCoreStringWithUndefinedOrNullCheck(message->Get());
+            *exceptionMessage = toCoreStringWithUndefinedOrNullCheck(message->Get());
     } else {
         *result = ScriptValue(value, m_isolate);
     }
 }
 
 PassOwnPtr<ScriptSourceCode> ScriptDebugServer::preprocess(Frame*, const ScriptSourceCode&)
 {
     return PassOwnPtr<ScriptSourceCode>();
 }
 
 String ScriptDebugServer::preprocessEventListener(Frame*, const String& source, const String& url, const String& functionName)
 {
     return source;
 }
 
 } // namespace WebCore