[webkit-changes] [161091] trunk/Source/WebCore

[joepeck]

Title: [161091] trunk/Source/WebCore

Revision

161091

Author

joep...@webkit.org

Date

2013-12-26 10:19:20 -0800 (Thu, 26 Dec 2013)

Log Message

Unreviewed attempt at Windows build fix.

I think Window's "AllInOne.cpp" is causing a using namespace JSC
to cause naming conflicts between Inspector::TypeBuilder::Debugger::types
and JSC::types. So removing the ambiguity.

* inspector/InjectedScript.cpp:
(WebCore::InjectedScript::getProperties):
(WebCore::InjectedScript::wrapCallFrames):

Modified Paths

• trunk/Source/WebCore/ChangeLog
• trunk/Source/WebCore/inspector/InjectedScript.cpp

Diff

Modified: trunk/Source/WebCore/ChangeLog (161090 => 161091)

--- trunk/Source/WebCore/ChangeLog	2013-12-26 18:01:50 UTC (rev 161090)
+++ trunk/Source/WebCore/ChangeLog	2013-12-26 18:19:20 UTC (rev 161091)
@@ -1,3 +1,15 @@
+2013-12-26  Joseph Pecoraro  <pecor...@apple.com>
+
+        Unreviewed attempt at Windows build fix.
+
+        I think Window's "AllInOne.cpp" is causing a using namespace JSC
+        to cause naming conflicts between Inspector::TypeBuilder::Debugger::types
+        and JSC::types. So removing the ambiguity.
+
+        * inspector/InjectedScript.cpp:
+        (WebCore::InjectedScript::getProperties):
+        (WebCore::InjectedScript::wrapCallFrames):
+
 2013-12-22  Andreas Kling  <akl...@apple.com>
 
         Make Text::createTextRenderer() take a const RenderStyle&.

Modified: trunk/Source/WebCore/inspector/InjectedScript.cpp (161090 => 161091)

--- trunk/Source/WebCore/inspector/InjectedScript.cpp	2013-12-26 18:01:50 UTC (rev 161090)
+++ trunk/Source/WebCore/inspector/InjectedScript.cpp	2013-12-26 18:19:20 UTC (rev 161091)
@@ -44,9 +44,7 @@
 #include <wtf/text/WTFString.h>
 
 using Inspector::TypeBuilder::Array;
-using Inspector::TypeBuilder::Debugger::CallFrame;
 using Inspector::TypeBuilder::Debugger::FunctionDetails;
-using Inspector::TypeBuilder::Runtime::PropertyDescriptor;
 using Inspector::TypeBuilder::Runtime::InternalPropertyDescriptor;
 using Inspector::TypeBuilder::Runtime::RemoteObject;
 
@@ -113,7 +111,7 @@
     *result = FunctionDetails::runtimeCast(resultValue);
 }
 
-void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<PropertyDescriptor>>* properties)
+void InjectedScript::getProperties(ErrorString* errorString, const String& objectId, bool ownProperties, RefPtr<Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>>* properties)
 {
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), "getProperties", WebCore::functionCallHandlerFromAnyThread);
     function.appendArgument(objectId);
@@ -125,7 +123,7 @@
         *errorString = "Internal error";
         return;
     }
-    *properties = Array<PropertyDescriptor>::runtimeCast(result);
+    *properties = Array<Inspector::TypeBuilder::Runtime::PropertyDescriptor>::runtimeCast(result);
 }
 
 void InjectedScript::getInternalProperties(ErrorString* errorString, const String& objectId, RefPtr<Array<InternalPropertyDescriptor>>* properties)
@@ -145,7 +143,7 @@
 }
 
 #if ENABLE(_javascript__DEBUGGER)
-PassRefPtr<Array<CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
+PassRefPtr<Array<Inspector::TypeBuilder::Debugger::CallFrame>> InjectedScript::wrapCallFrames(const Deprecated::ScriptValue& callFrames)
 {
     ASSERT(!hasNoValue());
     Deprecated::ScriptFunctionCall function(injectedScriptObject(), "wrapCallFrames", WebCore::functionCallHandlerFromAnyThread);
@@ -155,8 +153,8 @@
     ASSERT(!hadException);
     RefPtr<InspectorValue> result = callFramesValue.toInspectorValue(scriptState());
     if (result->type() == InspectorValue::TypeArray)
-        return Array<CallFrame>::runtimeCast(result);
-    return Array<CallFrame>::create();
+        return Array<Inspector::TypeBuilder::Debugger::CallFrame>::runtimeCast(result);
+    return Array<Inspector::TypeBuilder::Debugger::CallFrame>::create();
 }
 #endif
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes