[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
yurys at chromium.org
yurys at chromium.org
Wed Dec 22 11:44:12 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 832b914a0910b62414f99be95542fd1b71c6d3b7
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 5 12:36:31 2010 +0000
2010-08-05 Yury Semikhatsky <yurys at chromium.org>
Reviewed by Pavel Feldman.
Web Inspector: remove mutator methods from ScriptObject and remove ScriptArray.
We shouldn't modify JS objects from InspectorController, InspectorValues
should be used instead.
https://bugs.webkit.org/show_bug.cgi?id=43546
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/ScriptArray.cpp: Removed.
* bindings/js/ScriptArray.h: Removed.
* bindings/js/ScriptCallStack.h:
* bindings/js/ScriptObject.cpp:
* bindings/js/ScriptObject.h:
* bindings/v8/ScriptArray.cpp: Removed.
* bindings/v8/ScriptArray.h: Removed.
* bindings/v8/ScriptCallStack.h:
* bindings/v8/ScriptObject.cpp:
* bindings/v8/ScriptObject.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64735 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 93d0c5c..c8774e6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,28 @@
+2010-08-05 Yury Semikhatsky <yurys at chromium.org>
+
+ Reviewed by Pavel Feldman.
+
+ Web Inspector: remove mutator methods from ScriptObject and remove ScriptArray.
+ We shouldn't modify JS objects from InspectorController, InspectorValues
+ should be used instead.
+ https://bugs.webkit.org/show_bug.cgi?id=43546
+
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/ScriptArray.cpp: Removed.
+ * bindings/js/ScriptArray.h: Removed.
+ * bindings/js/ScriptCallStack.h:
+ * bindings/js/ScriptObject.cpp:
+ * bindings/js/ScriptObject.h:
+ * bindings/v8/ScriptArray.cpp: Removed.
+ * bindings/v8/ScriptArray.h: Removed.
+ * bindings/v8/ScriptCallStack.h:
+ * bindings/v8/ScriptObject.cpp:
+ * bindings/v8/ScriptObject.h:
+
2010-08-05 Ned Holbrook <nholbrook at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 3f3c0db..24ef312 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -755,8 +755,6 @@ webcore_sources += \
WebCore/bindings/js/JavaScriptCallFrame.h \
WebCore/bindings/js/ScheduledAction.cpp \
WebCore/bindings/js/ScheduledAction.h \
- WebCore/bindings/js/ScriptArray.cpp \
- WebCore/bindings/js/ScriptArray.h \
WebCore/bindings/js/ScriptCachedFrameData.cpp \
WebCore/bindings/js/ScriptCachedFrameData.h \
WebCore/bindings/js/ScriptCallFrame.cpp \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index d5ed3d2..be4585c 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -668,8 +668,6 @@
'bindings/js/JavaScriptCallFrame.h',
'bindings/js/ScheduledAction.cpp',
'bindings/js/ScheduledAction.h',
- 'bindings/js/ScriptArray.cpp',
- 'bindings/js/ScriptArray.h',
'bindings/js/ScriptCachedFrameData.cpp',
'bindings/js/ScriptCachedFrameData.h',
'bindings/js/ScriptCallFrame.cpp',
@@ -834,8 +832,6 @@
'bindings/v8/ScheduledAction.h',
'bindings/v8/ScopedDOMDataStore.cpp',
'bindings/v8/ScopedDOMDataStore.h',
- 'bindings/v8/ScriptArray.cpp',
- 'bindings/v8/ScriptArray.h',
'bindings/v8/ScriptCachedFrameData.h',
'bindings/v8/ScriptCallFrame.cpp',
'bindings/v8/ScriptCallFrame.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 12d056d..5cc9c9d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -368,7 +368,6 @@ SOURCES += \
bindings/js/JSPluginElementFunctions.cpp \
bindings/js/JSPopStateEventCustom.cpp \
bindings/js/JSWorkerContextErrorHandler.cpp \
- bindings/js/ScriptArray.cpp \
bindings/js/ScriptCachedFrameData.cpp \
bindings/js/ScriptCallFrame.cpp \
bindings/js/ScriptCallStack.cpp \
@@ -1124,7 +1123,6 @@ HEADERS += \
bindings/js/JSWorkerContextErrorHandler.h \
bindings/js/JavaScriptCallFrame.h \
bindings/js/ScheduledAction.h \
- bindings/js/ScriptArray.h \
bindings/js/ScriptCachedFrameData.h \
bindings/js/ScriptCallFrame.h \
bindings/js/ScriptCallStack.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index c0dc3be..3befab9 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -47756,62 +47756,6 @@
>
</File>
<File
- RelativePath="..\bindings\js\ScriptArray.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Internal|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath="..\bindings\js\ScriptArray.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\ScriptCachedFrameData.cpp"
>
<FileConfiguration
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index f5b9303..dc8427a 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1401,8 +1401,6 @@
7A0E770F10C00A8800A0276E /* InspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E770C10C00A8800A0276E /* InspectorFrontendHost.h */; };
7A0E771E10C00DB100A0276E /* JSInspectorFrontendHost.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */; };
7A0E771F10C00DB100A0276E /* JSInspectorFrontendHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */; };
- 7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */; };
- 7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */; };
7A24587C1021EAF4000A00AA /* InspectorDOMAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
7A674BDB0F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */; };
@@ -7198,8 +7196,6 @@
7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InspectorFrontendHost.idl; sourceTree = "<group>"; };
7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHost.cpp; sourceTree = "<group>"; };
7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectorFrontendHost.h; sourceTree = "<group>"; };
- 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptArray.cpp; sourceTree = "<group>"; };
- 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptArray.h; sourceTree = "<group>"; };
7A2458791021EAF4000A00AA /* InspectorDOMAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorDOMAgent.cpp; sourceTree = "<group>"; };
7A24587A1021EAF4000A00AA /* InspectorDOMAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorDOMAgent.h; sourceTree = "<group>"; };
7A674BD90F9EBF4E006CF099 /* PageGroupLoadDeferrer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroupLoadDeferrer.cpp; sourceTree = "<group>"; };
@@ -15805,8 +15801,6 @@
F3D461471161D53200CA0D09 /* JSWorkerContextErrorHandler.h */,
BCA378BA0D15F64200B793D6 /* ScheduledAction.cpp */,
BCA378BB0D15F64200B793D6 /* ScheduledAction.h */,
- 7A1E88F3101CC384000C4DF5 /* ScriptArray.cpp */,
- 7A1E88F4101CC384000C4DF5 /* ScriptArray.h */,
41F1D21E0EF35C2A00DA8753 /* ScriptCachedFrameData.cpp */,
41F1D21D0EF35C2A00DA8753 /* ScriptCachedFrameData.h */,
416E75CA0EDF90C700360E1D /* ScriptCallFrame.cpp */,
@@ -19432,7 +19426,6 @@
5162C7F511F77EFB00612EFE /* SchemeRegistry.h in Headers */,
BCEC01BE0C274DAC009F4EC9 /* Screen.h in Headers */,
A84D82C111D3474800972990 /* ScriptableDocumentParser.h in Headers */,
- 7A1E88F6101CC384000C4DF5 /* ScriptArray.h in Headers */,
7AFD4A8B1131C2760035B883 /* ScriptBreakpoint.h in Headers */,
41F1D21F0EF35C2A00DA8753 /* ScriptCachedFrameData.h in Headers */,
416E75CB0EDF90C700360E1D /* ScriptCallFrame.h in Headers */,
@@ -21909,7 +21902,6 @@
5162C7F411F77EFB00612EFE /* SchemeRegistry.cpp in Sources */,
BCEC01BD0C274DAC009F4EC9 /* Screen.cpp in Sources */,
A84D82C211D3474800972990 /* ScriptableDocumentParser.cpp in Sources */,
- 7A1E88F5101CC384000C4DF5 /* ScriptArray.cpp in Sources */,
200B190911C277D900DCCD3A /* ScriptBreakpoint.cpp in Sources */,
41F1D2200EF35C2A00DA8753 /* ScriptCachedFrameData.cpp in Sources */,
416E75CC0EDF90C700360E1D /* ScriptCallFrame.cpp in Sources */,
diff --git a/WebCore/bindings/js/IDBBindingUtilities.h b/WebCore/bindings/js/IDBBindingUtilities.h
index f410344..1e8270b 100644
--- a/WebCore/bindings/js/IDBBindingUtilities.h
+++ b/WebCore/bindings/js/IDBBindingUtilities.h
@@ -28,7 +28,6 @@
#if ENABLE(INDEXED_DATABASE)
-#include "ScriptValue.h"
#include <wtf/Forward.h>
namespace WebCore {
diff --git a/WebCore/bindings/js/ScheduledAction.cpp b/WebCore/bindings/js/ScheduledAction.cpp
index f69f8bd..a9dc6a8 100644
--- a/WebCore/bindings/js/ScheduledAction.cpp
+++ b/WebCore/bindings/js/ScheduledAction.cpp
@@ -34,7 +34,6 @@
#include "ScriptController.h"
#include "ScriptExecutionContext.h"
#include "ScriptSourceCode.h"
-#include "ScriptValue.h"
#include <runtime/JSLock.h>
#if ENABLE(WORKERS)
diff --git a/WebCore/bindings/js/ScriptArray.cpp b/WebCore/bindings/js/ScriptArray.cpp
deleted file mode 100644
index 119d303..0000000
--- a/WebCore/bindings/js/ScriptArray.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2009 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 "ScriptArray.h"
-
-#include "SerializedScriptValue.h"
-
-#include <runtime/JSLock.h>
-
-using namespace JSC;
-
-namespace WebCore {
-
-ScriptArray::ScriptArray(ScriptState* scriptState, JSArray* object)
- : ScriptObject(scriptState, object)
-{
-}
-
-static bool handleException(ScriptState* scriptState)
-{
- if (!scriptState->hadException())
- return true;
-
- reportException(scriptState, scriptState->exception());
- return false;
-}
-
-bool ScriptArray::set(unsigned index, const ScriptObject& value)
-{
- if (value.scriptState() != m_scriptState) {
- ASSERT_NOT_REACHED();
- return false;
- }
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, value.jsObject());
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, SerializedScriptValue* value)
-{
- ScriptValue scriptValue = ScriptValue::deserialize(m_scriptState, value);
- if (scriptValue.hasNoValue()) {
- ASSERT_NOT_REACHED();
- return false;
- }
-
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, scriptValue.jsValue());
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, const String& value)
-{
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, jsString(m_scriptState, value));
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, double value)
-{
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, jsNumber(m_scriptState, value));
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, long long value)
-{
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, jsNumber(m_scriptState, value));
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, int value)
-{
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, jsNumber(m_scriptState, value));
- return handleException(m_scriptState);
-}
-
-bool ScriptArray::set(unsigned index, bool value)
-{
- JSLock lock(SilenceAssertionsOnly);
- jsArray()->put(m_scriptState, index, jsBoolean(value));
- return handleException(m_scriptState);
-}
-
-unsigned ScriptArray::length()
-{
- JSLock lock(SilenceAssertionsOnly);
- return jsArray()->length();
-}
-
-ScriptArray ScriptArray::createNew(ScriptState* scriptState)
-{
- JSLock lock(SilenceAssertionsOnly);
- return ScriptArray(scriptState, constructEmptyArray(scriptState));
-}
-
-} // namespace WebCore
diff --git a/WebCore/bindings/js/ScriptArray.h b/WebCore/bindings/js/ScriptArray.h
deleted file mode 100644
index 2badd09..0000000
--- a/WebCore/bindings/js/ScriptArray.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-#ifndef ScriptArray_h
-#define ScriptArray_h
-
-#include "ScriptObject.h"
-#include "ScriptState.h"
-
-#include <runtime/JSArray.h>
-
-namespace WebCore {
-class SerializedScriptValue;
-
-class ScriptArray : public ScriptObject {
-public:
- ScriptArray(ScriptState*, JSC::JSArray*);
- ScriptArray() {}
- JSC::JSArray* jsArray() const { return asArray(jsValue()); }
-
- bool set(unsigned index, const ScriptObject&);
- bool set(unsigned index, SerializedScriptValue*);
- bool set(unsigned index, const String&);
- bool set(unsigned index, double);
- bool set(unsigned index, long long);
- bool set(unsigned index, int);
- bool set(unsigned index, bool);
- unsigned length();
-
- static ScriptArray createNew(ScriptState*);
-};
-}
-
-#endif // ScriptArray_h
diff --git a/WebCore/bindings/js/ScriptCallStack.h b/WebCore/bindings/js/ScriptCallStack.h
index e461ac3..a45e65a 100644
--- a/WebCore/bindings/js/ScriptCallStack.h
+++ b/WebCore/bindings/js/ScriptCallStack.h
@@ -31,7 +31,6 @@
#ifndef ScriptCallStack_h
#define ScriptCallStack_h
-#include "ScriptArray.h"
#include "ScriptCallFrame.h"
#include "ScriptState.h"
#include "ScriptString.h"
diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp
index de397f7..e06eccb 100644
--- a/WebCore/bindings/js/ScriptObject.cpp
+++ b/WebCore/bindings/js/ScriptObject.cpp
@@ -59,96 +59,6 @@ static bool handleException(ScriptState* scriptState)
return false;
}
-bool ScriptObject::set(const String& name, const String& value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, stringToUString(name)), jsString(m_scriptState, stringToUString(value)), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, const ScriptObject& value)
-{
- if (value.scriptState() != m_scriptState) {
- ASSERT_NOT_REACHED();
- return false;
- }
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), value.jsObject(), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, const String& value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsString(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, double value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, long value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, long long value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, int value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, unsigned value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, unsigned long value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsNumber(m_scriptState, value), slot);
- return handleException(m_scriptState);
-}
-
-bool ScriptObject::set(const char* name, bool value)
-{
- JSLock lock(SilenceAssertionsOnly);
- PutPropertySlot slot;
- jsObject()->put(m_scriptState, Identifier(m_scriptState, name), jsBoolean(value), slot);
- return handleException(m_scriptState);
-}
-
-ScriptObject ScriptObject::createNew(ScriptState* scriptState)
-{
- JSLock lock(SilenceAssertionsOnly);
- return ScriptObject(scriptState, constructEmptyObject(scriptState));
-}
-
bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
{
JSLock lock(SilenceAssertionsOnly);
diff --git a/WebCore/bindings/js/ScriptObject.h b/WebCore/bindings/js/ScriptObject.h
index 9880976..f085e8b 100644
--- a/WebCore/bindings/js/ScriptObject.h
+++ b/WebCore/bindings/js/ScriptObject.h
@@ -48,19 +48,6 @@ namespace WebCore {
JSC::JSObject* jsObject() const { return asObject(jsValue()); }
ScriptState* scriptState() const { return m_scriptState; }
- bool set(const String& name, const String&);
- bool set(const char* name, const ScriptObject&);
- bool set(const char* name, const String&);
- bool set(const char* name, double);
- bool set(const char* name, long);
- bool set(const char* name, long long);
- bool set(const char* name, int);
- bool set(const char* name, unsigned);
- bool set(const char* name, unsigned long);
- bool set(const char* name, bool);
-
- static ScriptObject createNew(ScriptState*);
-
protected:
ScriptState* m_scriptState;
};
diff --git a/WebCore/bindings/v8/ScheduledAction.cpp b/WebCore/bindings/v8/ScheduledAction.cpp
index f511e2b..dcd0bb3 100644
--- a/WebCore/bindings/v8/ScheduledAction.cpp
+++ b/WebCore/bindings/v8/ScheduledAction.cpp
@@ -34,7 +34,6 @@
#include "Document.h"
#include "ScriptExecutionContext.h"
#include "ScriptSourceCode.h"
-#include "ScriptValue.h"
#include "V8Binding.h"
#include "V8Proxy.h"
diff --git a/WebCore/bindings/v8/ScriptArray.cpp b/WebCore/bindings/v8/ScriptArray.cpp
deleted file mode 100644
index 7119b27..0000000
--- a/WebCore/bindings/v8/ScriptArray.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2009 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 "ScriptArray.h"
-
-#include "Document.h"
-#include "Frame.h"
-#include "ScriptScope.h"
-#include "ScriptState.h"
-#include "SerializedScriptValue.h"
-#include "V8Binding.h"
-#include "V8Proxy.h"
-
-namespace WebCore {
-
-ScriptArray::ScriptArray(ScriptState* scriptState, v8::Handle<v8::Array> v8Array)
- : ScriptObject(scriptState, v8Array)
-{
-}
-
-bool ScriptArray::set(unsigned index, const ScriptObject& value)
-{
- if (value.scriptState() != m_scriptState) {
- ASSERT_NOT_REACHED();
- return false;
- }
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), value.v8Value());
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, SerializedScriptValue* value)
-{
- ScriptValue scriptValue = ScriptValue::deserialize(m_scriptState, value);
- if (scriptValue.hasNoValue()) {
- ASSERT_NOT_REACHED();
- return false;
- }
-
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), scriptValue.v8Value());
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, const String& value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), v8String(value));
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, double value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, long long value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, int value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptArray::set(unsigned index, bool value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::Integer::New(index), v8Boolean(value));
- return scope.success();
-}
-
-unsigned ScriptArray::length()
-{
- ScriptScope scope(m_scriptState);
- return v8::Array::Cast(*v8Value())->Length();
-}
-
-ScriptArray ScriptArray::createNew(ScriptState* scriptState)
-{
- ScriptScope scope(scriptState);
- return ScriptArray(scriptState, v8::Array::New());
-}
-
-} // namespace WebCore
diff --git a/WebCore/bindings/v8/ScriptArray.h b/WebCore/bindings/v8/ScriptArray.h
deleted file mode 100644
index 9aa8764..0000000
--- a/WebCore/bindings/v8/ScriptArray.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2009 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.
- */
-
-#ifndef ScriptArray_h
-#define ScriptArray_h
-
-#include "ScriptObject.h"
-
-#include <v8.h>
-
-namespace WebCore {
-class ScriptState;
-class SerializedScriptValue;
-
-class ScriptArray : public ScriptObject {
-public:
- ScriptArray(ScriptState* scriptState, v8::Handle<v8::Array>);
- ScriptArray() {};
- virtual ~ScriptArray() {}
-
- bool set(unsigned index, const ScriptObject&);
- bool set(unsigned index, SerializedScriptValue*);
- bool set(unsigned index, const String&);
- bool set(unsigned index, double);
- bool set(unsigned index, long long);
- bool set(unsigned index, int);
- bool set(unsigned index, bool);
- unsigned length();
-
- static ScriptArray createNew(ScriptState*);
-};
-}
-
-#endif // ScriptArray_h
diff --git a/WebCore/bindings/v8/ScriptCallStack.h b/WebCore/bindings/v8/ScriptCallStack.h
index b608563..215cdec 100644
--- a/WebCore/bindings/v8/ScriptCallStack.h
+++ b/WebCore/bindings/v8/ScriptCallStack.h
@@ -31,7 +31,6 @@
#ifndef ScriptCallStack_h
#define ScriptCallStack_h
-#include "ScriptArray.h"
#include "ScriptCallFrame.h"
#include "ScriptState.h"
#include "ScriptValue.h"
diff --git a/WebCore/bindings/v8/ScriptObject.cpp b/WebCore/bindings/v8/ScriptObject.cpp
index 8f81537..3d38a9e 100644
--- a/WebCore/bindings/v8/ScriptObject.cpp
+++ b/WebCore/bindings/v8/ScriptObject.cpp
@@ -57,86 +57,6 @@ v8::Local<v8::Object> ScriptObject::v8Object() const
return v8::Local<v8::Object>(v8::Object::Cast(*v8Value()));
}
-bool ScriptObject::set(const String& name, const String& value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8String(name), v8String(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, const ScriptObject& value)
-{
- if (value.scriptState() != m_scriptState) {
- ASSERT_NOT_REACHED();
- return false;
- }
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), value.v8Value());
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, const String& value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8String(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, double value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, long value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, long long value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, int value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, unsigned value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, unsigned long value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8::Number::New(value));
- return scope.success();
-}
-
-bool ScriptObject::set(const char* name, bool value)
-{
- ScriptScope scope(m_scriptState);
- v8Object()->Set(v8::String::New(name), v8Boolean(value));
- return scope.success();
-}
-
-ScriptObject ScriptObject::createNew(ScriptState* scriptState)
-{
- ScriptScope scope(scriptState);
- return ScriptObject(scriptState, v8::Object::New());
-}
-
bool ScriptGlobalObject::set(ScriptState* scriptState, const char* name, const ScriptObject& value)
{
ScriptScope scope(scriptState);
diff --git a/WebCore/bindings/v8/ScriptObject.h b/WebCore/bindings/v8/ScriptObject.h
index bee079c..6b78cfc 100644
--- a/WebCore/bindings/v8/ScriptObject.h
+++ b/WebCore/bindings/v8/ScriptObject.h
@@ -48,19 +48,6 @@ namespace WebCore {
v8::Local<v8::Object> v8Object() const;
ScriptState* scriptState() const { return m_scriptState; }
-
- bool set(const String& name, const String&);
- bool set(const char* name, const ScriptObject&);
- bool set(const char* name, const String&);
- bool set(const char* name, double);
- bool set(const char* name, long);
- bool set(const char* name, long long);
- bool set(const char* name, int);
- bool set(const char* name, unsigned);
- bool set(const char* name, unsigned long);
- bool set(const char* name, bool);
-
- static ScriptObject createNew(ScriptState*);
protected:
ScriptState* m_scriptState;
};
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 21bb0f4..6888f6c 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -90,9 +90,9 @@
#include "ScriptController.h"
#include "ScriptSourceCode.h"
#include "ScriptString.h"
-#include "ScriptValue.h"
#include "SecurityOrigin.h"
#include "SegmentedString.h"
+#include "SerializedScriptValue.h"
#include "Settings.h"
#include "TextResourceDecoder.h"
#include "WindowFeatures.h"
diff --git a/WebCore/page/Frame.cpp b/WebCore/page/Frame.cpp
index 06cddb1..165aa32 100644
--- a/WebCore/page/Frame.cpp
+++ b/WebCore/page/Frame.cpp
@@ -72,7 +72,6 @@
#include "RenderView.h"
#include "ScriptController.h"
#include "ScriptSourceCode.h"
-#include "ScriptValue.h"
#include "Settings.h"
#include "TextIterator.h"
#include "TextResourceDecoder.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list