diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/build/JavaScriptCore/JavaScriptCore.vcproj | 352 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/copy_files.bat | 1 | ||||
| -rw-r--r-- | webkit/build/KJSBindings/KJSBindings.vcproj | 160 | ||||
| -rw-r--r-- | webkit/build/webkit_common_includes.vsprops | 2 | ||||
| -rw-r--r-- | webkit/port/bridge/KJSBridge.cpp | 133 | ||||
| -rw-r--r-- | webkit/port/platform/chromium/TemporaryLinkStubs.cpp | 64 |
6 files changed, 711 insertions, 1 deletions
diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj index 8f03179..9b31faa 100644 --- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj +++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj @@ -257,6 +257,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\debugger.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DebuggerCallFrame.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\DebuggerCallFrame.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\dtoa.cpp" > </File> @@ -445,6 +461,58 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNotAnObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNotAnObject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNumberCell.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSNumberCell.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\jsobject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSStaticScopeObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSStaticScopeObject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSString.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSString.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSType.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSValue.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSValue.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\JSVariableObject.cpp" > </File> @@ -461,6 +529,22 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelStack.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\LabelStack.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lexer.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\lookup.cpp" > </File> @@ -497,6 +581,18 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\nodes2string.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\NumberConstructor.cpp" > </File> @@ -545,6 +641,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\Parser.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\PropertyMap.cpp" > </File> @@ -589,6 +693,94 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpConstructor.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpConstructor.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpObject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpPrototype.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\RegExpPrototype.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChain.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChain.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\ScopeChainMark.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SmallStrings.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SmallStrings.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceProvider.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SourceRange.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringConstructor.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringConstructor.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringObjectThatMasqueradesAsUndefined.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringPrototype.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StringPrototype.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StructureID.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\StructureID.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\kjs\SymbolTable.h" > </File> @@ -713,6 +905,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\JSProfilerPrivate.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\JSProfilerPrivate.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\JSRetainPtr.h" > </File> @@ -740,6 +940,158 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\JSValueRef.h" > </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\OpaqueJSString.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\API\OpaqueJSString.h" + > + </File> + </Filter> + <Filter + Name="profiler" + > + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\CallIdentifier.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\HeavyProfile.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\HeavyProfile.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\Profile.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\Profile.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\ProfileGenerator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\ProfileGenerator.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\ProfileNode.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\ProfileNode.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\Profiler.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\Profiler.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\TreeProfile.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\profiler\TreeProfile.h" + > + </File> + </Filter> + <Filter + Name="VM" + > + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeBlock.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeBlock.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeGenerator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\CodeGenerator.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\ExceptionHelpers.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\ExceptionHelpers.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Instruction.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\JSPropertyNameIterator.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\JSPropertyNameIterator.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\LabelID.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Machine.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Machine.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Opcode.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Opcode.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\Register.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\RegisterFile.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\RegisterFile.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\RegisterID.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\SamplingTool.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\SamplingTool.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\VM\SegmentedVector.h" + > + </File> </Filter> <File RelativePath="..\precompiled_webkit.cc" diff --git a/webkit/build/JavaScriptCore/copy_files.bat b/webkit/build/JavaScriptCore/copy_files.bat index 431032b..9020479 100644 --- a/webkit/build/JavaScriptCore/copy_files.bat +++ b/webkit/build/JavaScriptCore/copy_files.bat @@ -18,5 +18,6 @@ xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JavaScriptCore.h" %DIR% xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\JSRetainPtr.h" %DIR% xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\OpaqueJSString.h" %DIR% xcopy /y /d "%JAVASCRIPTCORE_DIR%\API\WebKitAvailability.h" %DIR% +xcopy /y /d "%JAVASCRIPTCORE_DIR%\Profiler\Profiler.h" %DIR% endlocal diff --git a/webkit/build/KJSBindings/KJSBindings.vcproj b/webkit/build/KJSBindings/KJSBindings.vcproj index 85685bc..67e1cdd 100644 --- a/webkit/build/KJSBindings/KJSBindings.vcproj +++ b/webkit/build/KJSBindings/KJSBindings.vcproj @@ -125,6 +125,10 @@ Name="DerivedSources" > <File + RelativePath="$(IntDir)\DerivedSources\CSSGrammar.cpp" + > + </File> + <File RelativePath="$(IntDir)\DerivedSources\CSSGrammar.h" > </File> @@ -1433,6 +1437,158 @@ > </File> </Filter> + <Filter + Name="page" + > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptCallFrame.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptCallFrame.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugListener.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugServer.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptDebugServer.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfile.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfileNode.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\page\JavaScriptProfileNode.h" + > + </File> + </Filter> + <Filter + Name="bridge" + > + <File + RelativePath="..\..\port\bridge\KJSBridge.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\NP_jsobject.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\NP_jsobject.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\npruntime.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\npruntime.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\npruntime_impl.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\npruntime_internal.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\npruntime_priv.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_array.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_array.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_method.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_method.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_object.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_object.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_root.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\runtime_root.h" + > + </File> + <Filter + Name="c" + > + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_class.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_class.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_instance.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_instance.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_runtime.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_runtime.h" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_utility.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bridge\c\c_utility.h" + > + </File> + </Filter> + </Filter> <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\ExceptionContext.cpp" > @@ -1834,6 +1990,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSStorageCustom.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebCore\bindings\js\JSStyleSheetCustom.cpp" > </File> diff --git a/webkit/build/webkit_common_includes.vsprops b/webkit/build/webkit_common_includes.vsprops index c123e8b..8bd0b17 100644 --- a/webkit/build/webkit_common_includes.vsprops +++ b/webkit/build/webkit_common_includes.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins" + AdditionalIncludeDirectories=""$(OutDir)\obj\WebCore";"$(OutDir)\obj\WebCore\JavaScriptHeaders";"$(OutDir)\obj\WebCore\JavaScriptHeaders\JavaScriptCore";..\..\pending\;..\..\pending\kjs;..\..\pending\wtf;..\..\port\bridge;..\..\port\css;..\..\port\dom;..\..\port\history;..\..\port\loader;..\..\port\page;..\..\port\page\chromium;..\..\port\page\win;..\..\port\platform;..\..\port\platform\chromium;..\..\port\platform\win;..\..\port\platform\network\chromium;..\..\port\platform\image-decoders;..\..\port\platform\image-decoders\bmp;..\..\port\platform\image-decoders\gif;..\..\port\platform\image-decoders\ico;..\..\port\platform\image-decoders\jpeg;..\..\port\platform\image-decoders\png;..\..\port\platform\image-decoders\xbm;..\..\port\platform\network;..\..\port\plugins;..\..\port\rendering;..\..\;"$(ProjectDir)";..\..\..\third_party\WebKit\WebCore\;..\..\..\third_party\WebKit\WebCore\bridge;..\..\..\third_party\WebKit\WebCore\bridge\c;..\..\..\third_party\WebKit\WebCore\css;..\..\..\third_party\WebKit\WebCore\dom;..\..\..\third_party\WebKit\WebCore\editing;..\..\..\third_party\WebKit\WebCore\history;..\..\..\third_party\WebKit\WebCore\html;..\..\..\third_party\WebKit\WebCore\loader;..\..\..\third_party\WebKit\WebCore\loader\appcache;..\..\..\third_party\WebKit\WebCore\loader\archive;..\..\..\third_party\WebKit\WebCore\loader\icon;..\..\..\third_party\WebKit\WebCore\page;..\..\..\third_party\WebKit\WebCore\platform;..\..\..\third_party\WebKit\WebCore\page\animation;..\..\..\third_party\WebKit\WebCore\platform\text;..\..\..\third_party\WebKit\WebCore\platform\graphics;..\..\port\platform\graphics;..\..\port\platform\graphics\chromium;..\..\..\third_party\WebKit\WebCore\svg\graphics;..\..\..\third_party\WebKit\WebCore\platform\network;..\..\..\third_party\WebKit\WebCore\platform\sql;..\..\..\third_party\WebKit\WebCore\rendering;..\..\..\third_party\WebKit\WebCore\rendering\style;..\..\..\third_party\WebKit\WebCore\storage;..\..\..\third_party\WebKit\WebCore\xml;..\..\..\third_party\WebKit\WebCore;"..\..\..\third_party\WebKit\WebCore\os-win32";..\..\..\third_party\WebKit\WebCore\wtf;..\..\..\third_party\WebKit\JavaScriptCore;..\..\..\third_party\WebKit\JavaScriptCore\wtf;"..\..\..\third_party\WebKit\JavaScriptCore\os-win32";..\..\build;"$(SDKIncludes)";"$(IntDir)\..\WebCore\DerivedSources";..\..\..\third_party\WebKit\WebCore\svg;..\..\..\third_party\WebKit\WebCore\svg\animation;..\..\..\third_party\WebKit\WebCore\svg\graphics\filters;..\..\..\third_party\WebKit\WebCore\plugins" /> </VisualStudioPropertySheet> diff --git a/webkit/port/bridge/KJSBridge.cpp b/webkit/port/bridge/KJSBridge.cpp new file mode 100644 index 0000000..175503e --- /dev/null +++ b/webkit/port/bridge/KJSBridge.cpp @@ -0,0 +1,133 @@ +// Copyright (c) 2008, 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 +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT +// OWNER OR 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 "bindings/npruntime.h" +#include "npruntime_impl.h" +#include "npruntime_priv.h" + +// This file is a dumping ground for KJS-related fixups that we need. It +// should ideally be eliminated in favor of less lameness. + +// KJS should only expose functions declared in npruntime.h (NPN_*) +// and npruntime_priv.h (which is an extension of npruntime.h), and +// not exposing _NPN_* functions declared in npruntime_impl.h. +// KJSBridge implements NPN_* functions by wrapping around _NPN_* functions. +// +// Following styles in JavaScriptCore/bindings/npruntime.cpp +void NPN_ReleaseVariantValue(NPVariant *variant) { + _NPN_ReleaseVariantValue(variant); +} + +NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name) { + return _NPN_GetStringIdentifier(name); +} + +void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount, + NPIdentifier *identifiers) { + _NPN_GetStringIdentifiers(names, nameCount, identifiers); +} + +NPIdentifier NPN_GetIntIdentifier(int32_t intid) { + return _NPN_GetIntIdentifier(intid); +} + +bool NPN_IdentifierIsString(NPIdentifier identifier) { + return _NPN_IdentifierIsString(identifier); +} + +NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier) { + return _NPN_UTF8FromIdentifier(identifier); +} + +int32_t NPN_IntFromIdentifier(NPIdentifier identifier) { + return _NPN_IntFromIdentifier(identifier); +} + +NPObject *NPN_CreateObject(NPP npp, NPClass *aClass) { + return _NPN_CreateObject(npp, aClass); +} + +NPObject *NPN_RetainObject(NPObject *obj) { + return _NPN_RetainObject(obj); +} + +void NPN_ReleaseObject(NPObject *obj) { + _NPN_ReleaseObject(obj); +} + +void NPN_DeallocateObject(NPObject *obj) { + _NPN_DeallocateObject(obj); +} + +bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName, + const NPVariant *args, uint32_t argCount, NPVariant *result) { + return _NPN_Invoke(npp, npobj, methodName, args, argCount, result); +} + +bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args, + uint32_t argCount, NPVariant *result) { + return _NPN_InvokeDefault(npp, npobj, args, argCount, result); +} + +bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script, NPVariant *result) { + return _NPN_Evaluate(npp, npobj, script, result); +} + +bool NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, + NPVariant *result) { + return _NPN_GetProperty(npp, npobj, propertyName, result); +} + +bool NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName, + const NPVariant *value) { + return _NPN_SetProperty(npp, npobj, propertyName, value); +} + +bool NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName) { + return _NPN_RemoveProperty(npp, npobj, propertyName); +} + +bool NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName) { + return _NPN_HasProperty(npp, npobj, propertyName); +} + +bool NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName) { + return _NPN_HasMethod(npp, npobj, methodName); +} + +void NPN_SetException(NPObject *obj, const NPUTF8 *message) { + _NPN_SetException(obj, message); +} + +bool NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier, + uint32_t *count) { + return _NPN_Enumerate(npp, npobj, identifier, count); +} diff --git a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp index 97ef053..9418a7e 100644 --- a/webkit/port/platform/chromium/TemporaryLinkStubs.cpp +++ b/webkit/port/platform/chromium/TemporaryLinkStubs.cpp @@ -54,3 +54,67 @@ PassRefPtr<SharedBuffer> SharedBuffer::createWithContentsOfFile(const String& fi namespace WTF { void scheduleDispatchFunctionsOnMainThread() { notImplemented(); } } + +#if USE(JSC) +#include "c_instance.h" +#include "Database.h" +#include "DatabaseAuthorizer.h" +#include "Document.h" +#include "DOMWindow.h" +#include "EventLoop.h" +#include "JSStorageCustom.h" +#include "PluginView.h" +#include "SQLResultSet.h" +#include "SQLTransaction.h" +#include "SQLValue.h" +#include "Storage.h" +#include "StorageEvent.h" +#include "TimeRanges.h" + +using namespace KJS; + +Database::~Database() { notImplemented(); } +String Database::version() const { notImplemented(); return String(); } +void Database::transaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback) { notImplemented(); } +void Database::changeVersion(const String& oldVersion, const String& newVersion, PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback) { notImplemented(); } + +void EventLoop::cycle() { notImplemented(); } + +bool JSStorage::canGetItemsForName(ExecState*, Storage* impl, const Identifier& propertyName) { notImplemented(); return false; } +JSValue* JSStorage::nameGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot) { notImplemented(); return 0; } +bool JSStorage::deleteProperty(ExecState* exec, const Identifier& propertyName) { notImplemented(); return false; } +bool JSStorage::customPut(ExecState* exec, const Identifier& propertyName, JSValue* value, PutPropertySlot&) { notImplemented(); return false; } +bool JSStorage::customGetPropertyNames(ExecState* exec, PropertyNameArray& propertyNames) { notImplemented(); return false; } + +void PluginView::setJavaScriptPaused(bool) { notImplemented(); } +PassRefPtr<KJS::Bindings::Instance> PluginView::bindingInstance() { notImplemented(); return PassRefPtr<KJS::Bindings::Instance>(0); } + +SQLiteDatabase::~SQLiteDatabase() { notImplemented(); } +SQLiteTransaction::~SQLiteTransaction() { notImplemented(); } + +int64_t SQLResultSet::insertId(ExceptionCode&) const { notImplemented(); return 0; } +int SQLResultSet::rowsAffected() const { notImplemented(); return 0; } +SQLResultSetRowList* SQLResultSet::rows() const { notImplemented(); return 0; } + +unsigned int SQLResultSetRowList::length() const { notImplemented(); return 0; } + +SQLTransaction::~SQLTransaction() { notImplemented(); } +void SQLTransaction::executeSQL(const String&, const Vector<SQLValue>&, PassRefPtr<SQLStatementCallback>, PassRefPtr<SQLStatementErrorCallback>, ExceptionCode&) { notImplemented(); } + +SQLValue::SQLValue(class WebCore::SQLValue const &) {} +String SQLValue::string() const { return String(); } +double SQLValue::number() const { return 0.0; } + +unsigned Storage::length() const { notImplemented(); return 0; } +String Storage::key(unsigned index, ExceptionCode&) const { notImplemented(); return String(); } +String Storage::getItem(const String&) const { notImplemented(); return String(); } +void Storage::setItem(const String& key, const String& value, ExceptionCode&) { notImplemented(); } +void Storage::removeItem(const String&) { notImplemented(); } +void Storage::clear() { notImplemented(); } + +void StorageEvent::initStorageEvent(const AtomicString& type, bool canBubble, bool cancelable, const String& key, const String& oldValue, const String& newValue, const String& uri, PassRefPtr<DOMWindow> source) { notImplemented(); } + +float TimeRanges::start(unsigned int, int&) const { notImplemented(); return 0.0; } +float TimeRanges::end(unsigned int, int&) const { notImplemented(); return 0.0; } + +#endif |