diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 03:44:35 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-31 03:44:35 +0000 |
commit | a5e2f667cecad6a1eea2b0ac51498d322b57db3d (patch) | |
tree | 139f216ae764437895368bd4e0b9d8bf3ae784f2 /webkit/build | |
parent | b3e2fad0a13695466c07ce4c982fa98448e407a0 (diff) | |
download | chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.zip chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.tar.gz chromium_src-a5e2f667cecad6a1eea2b0ac51498d322b57db3d.tar.bz2 |
Fix the JSC build.
This involved fixing up vcproj files and making some KJS -> JSC changes. I also had to fix some issues related to ScriptCallContext.
I had to create a ScriptControllerChromium.cpp for the JSC build to provide an implementation of createScriptInstanceForWidget that knows how to talk to our plugin implementation. This file belongs in bindings/js alongside files like ScriptControllerWin.cpp, so I created webkit/port/bindings/js to house it.
R=dglazkov,ojan
Review URL: http://codereview.chromium.org/8947
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r-- | webkit/build/JavaScriptCore/JavaScriptCore.vcproj | 36 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj | 4 | ||||
-rw-r--r-- | webkit/build/KJSBindings/KJSBindings.vcproj | 128 |
3 files changed, 124 insertions, 44 deletions
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj index 9b31faa..2c7e76d 100644 --- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj +++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj @@ -361,14 +361,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\IndexToNameMap.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\IndexToNameMap.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\InitializeThreading.cpp" > </File> @@ -1025,6 +1017,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CTI.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CTI.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\ExceptionHelpers.cpp" > </File> @@ -1093,6 +1093,26 @@ > </File> </Filter> + <Filter + Name="wrec" + > + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wrec\CharacterClassConstructor.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wrec\CharacterClassConstructor.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wrec\WREC.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wrec\WREC.h" + > + </File> + </Filter> <File RelativePath="..\precompiled_webkit.cc" > diff --git a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj index 78721ce..a46a3f3 100644 --- a/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj +++ b/webkit/build/JavaScriptCore/JavaScriptCore_pcre.vcproj @@ -142,10 +142,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\pcre\pcre_tables.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\pcre\pcre_ucp_searchfuncs.cpp" > </File> diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index 9483d81..86fa623 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -477,6 +477,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\JSEventTargetNode.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\JSEventTargetNode.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\JSFile.cpp" > </File> @@ -1029,6 +1037,10 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\JSKeyboardEvent.cpp" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\JSKeyboardEvent.h" > </File> @@ -1057,6 +1069,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\JSMessageChannel.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\JSMessageChannel.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\JSMessageEvent.cpp" > </File> @@ -1065,6 +1085,14 @@ > </File> <File + RelativePath="$(IntDir)\DerivedSources\JSMessagePort.cpp" + > + </File> + <File + RelativePath="$(IntDir)\DerivedSources\JSMessagePort.h" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\JSMimeType.cpp" > </File> @@ -2521,11 +2549,11 @@ > </File> <File - RelativePath="$(IntDir)\DerivedSources\UserAgentStyleSheetsData.cpp" + RelativePath="$(IntDir)\DerivedSources\UserAgentStyleSheets.h" > </File> <File - RelativePath="$(IntDir)\DerivedSources\UserAgentStyleSheets.h" + RelativePath="$(IntDir)\DerivedSources\UserAgentStyleSheetsData.cpp" > </File> <File @@ -2562,22 +2590,54 @@ </File> </Filter> <Filter - Name="page" + Name="inspector" > <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorClient.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\InspectorController.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptCallFrame.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptCallFrame.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptDebugListener.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptDebugServer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptDebugServer.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptProfile.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptProfile.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfileNode.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptProfileNode.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfileNode.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\inspector\JavaScriptProfileNode.h" > </File> </Filter> @@ -2722,10 +2782,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSCanvasPixelArrayCustom.cpp" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSCanvasRenderingContext2DCustom.cpp" > </File> @@ -2858,23 +2914,23 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTargetBase.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTarget.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTargetBase.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTarget.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTargetNode.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTargetNodeCustom.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSEventTargetNode.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHistoryCustom.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHistoryCustom.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLAllCollection.cpp" > </File> <File @@ -2918,11 +2974,11 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLInputElementBase.cpp" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLInputElementCustom.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLInputElementBase.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSHTMLInputElementCustom.h" > </File> <File @@ -2958,6 +3014,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSImageDataCustom.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSInspectedObjectWrapper.cpp" > </File> @@ -2978,6 +3038,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSMessageChannelConstructor.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSMessageChannelConstructor.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSMessageChannelCustom.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSMessagePortCustom.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSMimeTypeArrayCustom.cpp" > </File> @@ -3022,14 +3098,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSNSResolver.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSNSResolver.h" - > - </File> - <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSPluginArrayCustom.cpp" > </File> @@ -3070,11 +3138,7 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSSVGLazyEventListener.cpp" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSSVGLazyEventListener.h" + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSSVGElementInstanceCustom.cpp" > </File> <File @@ -3194,7 +3258,7 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\ScriptControllerWin.cpp" + RelativePath="..\..\port\bindings\js\ScriptControllerChromium.cpp" > </File> <File |