JavaScriptCore:
authorkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Sep 2007 17:04:19 +0000 (17:04 +0000)
committerkmccullo <kmccullo@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 24 Sep 2007 17:04:19 +0000 (17:04 +0000)
        Reviewed by Sam.

        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.

        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:

WebCore:

        Reviewed by Sam.

        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.

        * WebCore.vcproj/WebCore.vcproj:

WebKitTools:

        Reviewed by Sam.

        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.

        * DumpRenderTree/win/DumpRenderTree.vcproj:
        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@25712 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj
JavaScriptCore/JavaScriptCore.vcproj/testkjs/testkjs.vcproj
WebCore/ChangeLog
WebCore/WebCore.vcproj/WebCore.vcproj
WebKitTools/ChangeLog
WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp [new file with mode: 0755]
WebKitTools/DumpRenderTree/win/DumpRenderTree.vcproj
WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj

index 67aff3324f1731bf0bf38168a4465cc0702de4d4..c910ee5e028a772c5e941f9cca9ad44a3a33ab05 100644 (file)
@@ -1,3 +1,12 @@
+2007-09-21  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.
+
+        * JavaScriptCore.vcproj/dftables/dftables.vcproj:
+        * JavaScriptCore.vcproj/testkjs/testkjs.vcproj:
+
 2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Rubber stamped by Adam.
index 0ee79aa8a188ed90d66e0af40883be5401293be1..3b0ee420ce2c831869bd505f43f8c46f6bed130d 100644 (file)
@@ -50,7 +50,7 @@
                                UsePrecompiledHeader="0"
                                WarningLevel="3"
                                Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
index 8334d928fa47e8cfddce9d48b0de66870b97b2ef..fd0323444aa8a452346b23b9b574532569ec4cf7 100644 (file)
@@ -52,7 +52,7 @@
                                WarningLevel="4"
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                                DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4996"
                        />
                        <Tool
                                WarningLevel="4"
                                WarnAsError="true"
                                Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                                DisableSpecificWarnings="4127;4355;4510;4512;4610;4706;4996"
                        />
                        <Tool
index 1ad2d99522fc1d0c1de52a40313fde2f57423f71..399c8abb520387f95b23338fc2c3035790948fbc 100644 (file)
@@ -1,3 +1,11 @@
+2007-09-21  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.
+
+        * WebCore.vcproj/WebCore.vcproj:
+
 2007-09-24  Brady Eidson  <beidson@apple.com>
 
         Reviewed by John Sullivan
index d7375b98e190b604c506f5ecaebfb7e706ca5335..722b38148dae905a26f2e9d0d35b33c513b87109 100644 (file)
@@ -55,7 +55,7 @@
                                WarningLevel="4"
                                WarnAsError="false"
                                Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                                DisableSpecificWarnings="4099;4100;4127;4138;4189;4244;4510;4512;4610;4706;4800;4996;4355;4291;4068;6011;6031;6211;6246;6255;6387"
                                ForcedIncludeFiles="WebCorePrefix.h"
                        />
                                WarningLevel="4"
                                WarnAsError="false"
                                Detect64BitPortabilityProblems="false"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                                DisableSpecificWarnings="4099;4100;4127;4138;4189;4244;4510;4512;4610;4706;4800;4996;4355;4291;4068;6011;6031;6211;6246;6255;6387"
                                ForcedIncludeFiles="WebCorePrefix.h"
                        />
index 38dc0e3bbb97632c0df80fa2055bcd8915b19336..1a50dd5fdf6f99ab7285dde8d5ca7abff664933c 100644 (file)
@@ -1,3 +1,12 @@
+2007-09-24  Kevin McCullough  <kmccullough@apple.com>
+
+        Reviewed by Sam.
+
+        - Updated project files to not use Edit and Continue for Debug Information since it doesn't work and breaks some functionality.
+
+        * DumpRenderTree/win/DumpRenderTree.vcproj:
+        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:
+
 2007-09-20  Holger Hans Peter Freyther  <zecke@selfish.org>
 
         Rubber stamped by Adam.
diff --git a/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp b/WebKitTools/Drosera/win/DebuggerDocumentPlatform.cpp
new file mode 100755 (executable)
index 0000000..d699672
--- /dev/null
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2007 Apple, 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:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "config.h"
+#include "DebuggerDocument.h"
+
+#include "DebuggerClient.h"
+
+//#include <JavaScriptCore/JSContextRef.h>
+//#include <JavaScriptCore/JSRetainPtr.h>
+//#include <JavaScriptCore/JSStringRef.h>
+//#include <JavaScriptCore/JSStringRefCF.h>
+//#include <JavaScriptCore/RetainPtr.h>
+
+// DebuggerDocument platform specific implementations
+
+void DebuggerDocument::platformPause()
+{
+    m_debuggerClient->pause();
+}
+
+void DebuggerDocument::platformResume()
+{
+    m_debuggerClient->resume();
+}
+
+void DebuggerDocument::platformStepInto()
+{
+    m_debuggerClient->stepInto();
+}
+
+JSValueRef DebuggerDocument::platformEvaluateScript(JSContextRef context, JSStringRef /*script*/, int /*callFrame*/)
+{
+//    WebScriptCallFrame *cframe = [m_debuggerClient currentFrame];
+//    for (unsigned count = 0; count < callFrame; count++)
+//        cframe = [cframe caller];
+//
+//    if (!cframe)
+        return JSValueMakeUndefined(context);
+//
+//    RetainPtr<CFStringRef> scriptCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, script));
+//    id value = [cframe evaluateWebScript:(NSString *)scriptCF.get()];
+//
+//    NSString *resultString = [NSString stringOrNilFromWebScriptResult:value];
+//    JSRetainPtr<JSStringRef> resultJS(KJS::Adopt, JSStringCreateWithCFString((CFStringRef)resultString));
+//    JSValueRef returnValue = JSValueMakeString(context, resultJS.get());
+//
+//    return returnValue;
+}
+
+void DebuggerDocument::getPlatformCurrentFunctionStack(JSContextRef /*context*/, Vector<JSValueRef>& /*currentStack*/)
+{
+//    for (WebScriptCallFrame *frame = [m_debuggerClient currentFrame]; frame;) {
+//        CFStringRef function;
+//        if ([frame functionName])
+//            function = (CFStringRef)[frame functionName];
+//        else if ([frame caller])
+//            function = CFSTR("(anonymous function)");
+//        else
+//            function = CFSTR("(global scope)");
+//        frame = [frame caller];
+//
+//        JSRetainPtr<JSStringRef> stackString(KJS::Adopt, JSStringCreateWithCFString(function));
+//        JSValueRef stackValue = JSValueMakeString(context, stackString.get());
+//        currentStack.append(stackValue);
+//    }
+}
+
+void DebuggerDocument::getPlatformLocalScopeVariableNamesForCallFrame(JSContextRef /*context*/, int /*callFrame*/, Vector<JSValueRef>& /*variableNames*/)
+{
+//    WebScriptCallFrame *cframe = [m_debuggerClient currentFrame];
+//    for (unsigned count = 0; count < callFrame; count++)
+//        cframe = [cframe caller];
+//
+//    if (!cframe)
+//        return;
+//    if (![[cframe scopeChain] count])
+//        return;
+//
+//    WebScriptObject *scope = [[cframe scopeChain] objectAtIndex:0]; // local is always first
+//    NSArray *localScopeVariableNames = [m_debuggerClient webScriptAttributeKeysForScriptObject:scope];
+//
+//    for (int i = 0; i < [localScopeVariableNames count]; ++i) {
+//        JSRetainPtr<JSStringRef> variableName(KJS::Adopt, JSStringCreateWithCFString((CFStringRef)[localScopeVariableNames objectAtIndex:i]));
+//        JSValueRef variableNameValue = JSValueMakeString(context, variableName.get());
+//        variableNames.append(variableNameValue);
+//    }
+}
+
+JSValueRef DebuggerDocument::platformValueForScopeVariableNamed(JSContextRef context, JSStringRef /*key*/, int /*callFrame*/)
+{
+//    WebScriptCallFrame *cframe = [m_debuggerClient currentFrame];
+//    for (unsigned count = 0; count < callFrame; count++)
+//        cframe = [cframe caller];
+//
+//    if (!cframe)
+//        return JSValueMakeUndefined(context);
+//
+//    unsigned scopeCount = [[cframe scopeChain] count];
+//    
+//    if (!scopeCount)
+//        return JSValueMakeUndefined(context);
+//
+//    NSString *resultString = nil;
+//    
+//    for (unsigned i = 0; i < scopeCount && resultString == nil; i++) {
+//        WebScriptObject *scope = [[cframe scopeChain] objectAtIndex:i];
+//
+//        RetainPtr<CFStringRef> keyCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, key));
+//        
+//        id value = nil;
+//        @try {
+//            value = [scope valueForKey:(NSString *)keyCF.get()];
+//        } @catch(NSException* localException) { // The value wasn't found.
+//        }
+//
+//        resultString = [NSString stringOrNilFromWebScriptResult:value];
+//    }
+//
+//    if (!resultString)
+        return JSValueMakeUndefined(context);
+//
+//    JSRetainPtr<JSStringRef> resultJS(KJS::Adopt, JSStringCreateWithCFString((CFStringRef)resultString));
+//    JSValueRef retVal = JSValueMakeString(context, resultJS.get());
+//    return retVal;
+}
+
+void DebuggerDocument::platformLog(JSStringRef /*msg*/)
+{
+//    RetainPtr<CFStringRef> msgCF(AdoptCF, JSStringCopyCFString(kCFAllocatorDefault, msg));
+//    [DebuggerClientMac log:(NSString *)msgCF.get()];
+}
\ No newline at end of file
index 3e015e8a7328a6b4efbd667f4f9a4271b9498d55..a088c2ec7f6a9c5a6d61d961fae19224751555c7 100644 (file)
@@ -49,7 +49,7 @@
                                UsePrecompiledHeader="0"
                                WarningLevel="1"
                                Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
                                UsePrecompiledHeader="0"
                                WarningLevel="1"
                                Detect64BitPortabilityProblems="true"
-                               DebugInformationFormat="4"
+                               DebugInformationFormat="3"
                        />
                        <Tool
                                Name="VCManagedResourceCompilerTool"
index 5389333d32873d99f850348de9988306ef1856f0..4dd3ab94da9e10040b9e73cc894ffbbecf39634e 100644 (file)
@@ -49,7 +49,7 @@
                                UsePrecompiledHeader="0"\r
                                WarningLevel="3"\r
                                Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
+                               DebugInformationFormat="3"\r
                                DisableSpecificWarnings="4267"\r
                        />\r
                        <Tool\r