Reviewed by Geoff.

        Rename the TestNetscapePlugIn .c files to be .cpp.

        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: Removed.
        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c.
        * DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c: Removed.
        * DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c.
        * DumpRenderTree/TestNetscapePlugIn.subproj/main.c: Removed.
        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/main.c.
        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index beecf95c94e798f868414824996aee905dba9847..4aaecddba6df45116d2768a545eaec76e9c71ce2 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-05  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Geoff.
+        
+        Rename the TestNetscapePlugIn .c files to be .cpp.
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c: Removed.
+        * DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c.
+        * DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c: Removed.
+        * DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c.
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.c: Removed.
+        * DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp: Copied from DumpRenderTree/TestNetscapePlugIn.subproj/main.c.
+        * DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj:
+
 2007-12-05  Adam Roben  <aroben@apple.com>
 
         Fix case of keypresses from the Windows implementation of eventSender.keyDown

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
index d451ffee303d58b3a781cc9ecd02b8da790b0392..462ffa85ac52fb7df4e18f41e774d8f8c3a2f82c 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
@@ -27,12 +27,9 @@
                141BF436096A455900E0753C /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A84F608908B136DA00E9745F /* Cocoa.framework */; };
                141BF438096A455900E0753C /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A817090308B164D300CCB9FB /* JavaScriptCore.framework */; };
                141BF439096A455900E0753C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE8257EF08D22389000507AB /* Carbon.framework */; };
-               141BF44A096A45C800E0753C /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 141BF445096A45C800E0753C /* main.c */; settings = {COMPILER_FLAGS = "-Wno-deprecated-declarations"; }; };
-               141BF44B096A45C800E0753C /* PluginObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 141BF446096A45C800E0753C /* PluginObject.c */; };
                141BF44C096A45C800E0753C /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 141BF448096A45C800E0753C /* Info.plist */; };
                141BF453096A45EB00E0753C /* PluginObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 141BF447096A45C800E0753C /* PluginObject.h */; };
                14770FE20A22ADF7009342EE /* GCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 14770FE00A22ADF7009342EE /* GCController.h */; };
-               1A8F02E70BB9B4EC008CFA34 /* TestObject.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A8F024D0BB9B056008CFA34 /* TestObject.c */; };
                1A8F02E80BB9B4EC008CFA34 /* TestObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8F024C0BB9B056008CFA34 /* TestObject.h */; };
                9340994C08540CAE007F3BC8 /* DumpRenderTreePrefix.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */; };
                9340995108540CAE007F3BC8 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9335435F03D75502008635CE /* WebKit.framework */; };
@@ -120,13 +117,13 @@
 
 /* Begin PBXFileReference section */
                141BF233096A44CF00E0753C /* TestNetscapePlugIn.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = TestNetscapePlugIn.plugin; sourceTree = BUILT_PRODUCTS_DIR; };
-               141BF445096A45C800E0753C /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-               141BF446096A45C800E0753C /* PluginObject.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = PluginObject.c; sourceTree = "<group>"; };
                141BF447096A45C800E0753C /* PluginObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginObject.h; sourceTree = "<group>"; };
                141BF448096A45C800E0753C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
                14770FE00A22ADF7009342EE /* GCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCController.h; sourceTree = "<group>"; };
                1A8F024C0BB9B056008CFA34 /* TestObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestObject.h; sourceTree = "<group>"; };
-               1A8F024D0BB9B056008CFA34 /* TestObject.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = TestObject.c; sourceTree = "<group>"; };
+               1AC6C77F0D07589B00CD3161 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
+               1AC6C7800D07589B00CD3161 /* PluginObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginObject.cpp; sourceTree = "<group>"; };
+               1AC6C7810D07589B00CD3161 /* TestObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TestObject.cpp; sourceTree = "<group>"; };
                32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreePrefix.h; sourceTree = "<group>"; };
                9335435F03D75502008635CE /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = WebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
                9340995408540CAF007F3BC8 /* DumpRenderTree */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = DumpRenderTree; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -264,10 +261,10 @@
                141BF1F5096A439800E0753C /* TestNetscapePlugIn.subproj */ = {
                        isa = PBXGroup;
                        children = (
-                               141BF445096A45C800E0753C /* main.c */,
-                               141BF446096A45C800E0753C /* PluginObject.c */,
+                               1AC6C77F0D07589B00CD3161 /* main.cpp */,
+                               1AC6C7800D07589B00CD3161 /* PluginObject.cpp */,
                                141BF447096A45C800E0753C /* PluginObject.h */,
-                               1A8F024D0BB9B056008CFA34 /* TestObject.c */,
+                               1AC6C7810D07589B00CD3161 /* TestObject.cpp */,
                                1A8F024C0BB9B056008CFA34 /* TestObject.h */,
                                141BF448096A45C800E0753C /* Info.plist */,
                        );
@@ -537,9 +534,6 @@
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               141BF44B096A45C800E0753C /* PluginObject.c in Sources */,
-                               1A8F02E70BB9B4EC008CFA34 /* TestObject.c in Sources */,
-                               141BF44A096A45C800E0753C /* main.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp
similarity index 97%
rename from WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
rename to WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp
index 41e00a34a6d62bed27f26cbb3ed8675c50840eda..f9c808f02ef033a1cee42147a998698a13a94d36 100644 (file)
--- a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
+++ b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.cpp
@@ -93,8 +93,7 @@ static const NPUTF8 *pluginPropertyIdentifierNames[NUM_PROPERTY_IDENTIFIERS] = {
 #define ID_TEST_INVOKE_DEFAULT      5
 #define ID_DESTROY_STREAM           6
 #define ID_TEST_ENUMERATE           7
-#define ID_TEST_GETINTIDENTIFIER    8
-#define NUM_METHOD_IDENTIFIERS      9
+#define NUM_METHOD_IDENTIFIERS      8
 
 static NPIdentifier pluginMethodIdentifiers[NUM_METHOD_IDENTIFIERS];
 static const NPUTF8 *pluginMethodIdentifierNames[NUM_METHOD_IDENTIFIERS] = {
@@ -105,8 +104,7 @@ static const NPUTF8 *pluginMethodIdentifierNames[NUM_METHOD_IDENTIFIERS] = {
     "getURLNotify",
     "testInvokeDefault",
     "destroyStream",
-    "testEnumerate",
-    "testGetIntIdentifier"
+    "testEnumerate"
 };
 
 static NPUTF8* createCStringFromNPVariant(const NPVariant *variant)
@@ -284,7 +282,7 @@ static bool pluginInvoke(NPObject *header, NPIdentifier name, const NPVariant *a
             if (browser->enumerate(obj->npp, NPVARIANT_TO_OBJECT(args[0]), &identifiers, &count)) {
                 NPObject* outArray = NPVARIANT_TO_OBJECT(args[1]);
                 NPIdentifier pushIdentifier = browser->getstringidentifier("push");
-
+                
                 for (uint32_t i = 0; i < count; i++) {
                     NPUTF8* string = browser->utf8fromidentifier(identifiers[i]);
                     
@@ -298,7 +296,7 @@ static bool pluginInvoke(NPObject *header, NPIdentifier name, const NPVariant *a
                     browser->releasevariantvalue(&browserResult);
                     browser->memfree(string);
                 }
-
+                
                 browser->memfree(identifiers);
             }
             
@@ -309,13 +307,7 @@ static bool pluginInvoke(NPObject *header, NPIdentifier name, const NPVariant *a
         NPError npError = browser->destroystream(obj->npp, obj->stream, NPRES_USER_BREAK);
         INT32_TO_NPVARIANT(npError, *result);
         return true;        
-    } else if (name == pluginMethodIdentifiers[ID_TEST_GETINTIDENTIFIER]) {
-        if (argCount == 1 && NPVARIANT_IS_DOUBLE(args[0])) {
-            NPIdentifier identifier = browser->getintidentifier((int)NPVARIANT_TO_DOUBLE(args[0]));
-            INT32_TO_NPVARIANT((int32)identifier, *result);
-            return true;
-        }
-    }
+    } 
     return false;
 }
 

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.cpp
similarity index 100%
rename from WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c
rename to WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.cpp

diff --git a/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c b/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp
similarity index 100%
rename from WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
rename to WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.cpp

diff --git a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj
index 4dd3ab94da9e10040b9e73cc894ffbbecf39634e..613b28526459a9da07fbf8fe002052487a7eea7d 100644 (file)
--- a/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj
+++ b/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/TestNetscapePlugin.vcproj
@@ -183,44 +183,12 @@
        </References>\r
        <Files>\r
                <File\r
-                       RelativePath=".\main.c"\r
+                       RelativePath=".\main.cpp"\r
                        >\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
                </File>\r
                <File\r
-                       RelativePath="..\..\TestNetscapePlugIn.subproj\PluginObject.c"\r
+                       RelativePath="..\..\TestNetscapePlugIn.subproj\PluginObject.cpp"\r
                        >\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\..\TestNetscapePlugIn.subproj\PluginObject.h"\r
@@ -239,24 +207,8 @@
                        >\r
                </File>\r
                <File\r
-                       RelativePath="..\..\TestNetscapePlugIn.subproj\TestObject.c"\r
+                       RelativePath="..\..\TestNetscapePlugIn.subproj\TestObject.cpp"\r
                        >\r
-                       <FileConfiguration\r
-                               Name="Debug|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
-                       <FileConfiguration\r
-                               Name="Release|Win32"\r
-                               >\r
-                               <Tool\r
-                                       Name="VCCLCompilerTool"\r
-                                       CompileAs="2"\r
-                               />\r
-                       </FileConfiguration>\r
                </File>\r
                <File\r
                        RelativePath="..\..\TestNetscapePlugIn.subproj\TestObject.h"\r