Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (134249 => 134250)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-12 17:57:43 UTC (rev 134250)
@@ -1,3 +1,15 @@
+2012-11-12 Kentaro Hara <[email protected]>
+
+ [V8][JSC] ScriptProfileNode::callUID needs not to be [Custom]
+ https://bugs.webkit.org/show_bug.cgi?id=101892
+
+ Reviewed by Adam Barth.
+
+ Added callUID(), which enables us to kill custom bindings for ScriptProfileNode::callUID.
+
+ * profiler/ProfileNode.h:
+ (JSC::ProfileNode::callUID):
+
2012-11-12 Carlos Garcia Campos <[email protected]>
Unreviewed. Fix make distcheck.
Modified: trunk/Source/_javascript_Core/profiler/ProfileNode.h (134249 => 134250)
--- trunk/Source/_javascript_Core/profiler/ProfileNode.h 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/_javascript_Core/profiler/ProfileNode.h 2012-11-12 17:57:43 UTC (rev 134250)
@@ -64,6 +64,7 @@
// CallIdentifier members
ExecState* callerCallFrame() const { return m_callerCallFrame; }
const CallIdentifier& callIdentifier() const { return m_callIdentifier; }
+ unsigned long callUID() const { return m_callIdentifier.hash(); };
const String& functionName() const { return m_callIdentifier.m_name; }
const String& url() const { return m_callIdentifier.m_url; }
unsigned lineNumber() const { return m_callIdentifier.m_lineNumber; }
Modified: trunk/Source/WebCore/ChangeLog (134249 => 134250)
--- trunk/Source/WebCore/ChangeLog 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/ChangeLog 2012-11-12 17:57:43 UTC (rev 134250)
@@ -1,5 +1,27 @@
2012-11-12 Kentaro Hara <[email protected]>
+ [V8][JSC] ScriptProfileNode::callUID needs not to be [Custom]
+ https://bugs.webkit.org/show_bug.cgi?id=101892
+
+ Reviewed by Adam Barth.
+
+ We can remove [Custom] from callUID in ScriptProfileNode.idl.
+
+ No tests. No change in behavior.
+
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * UseJSC.cmake:
+ * WebCore.gypi:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSBindingsAllInOne.cpp:
+ * bindings/js/JSScriptProfileNodeCustom.cpp: Removed.
+ * bindings/v8/custom/V8ScriptProfileNodeCustom.cpp:
+ * inspector/ScriptProfileNode.idl:
+
+2012-11-12 Kentaro Hara <[email protected]>
+
[V8] Performance::memory getter needs not to be [Custom]
https://bugs.webkit.org/show_bug.cgi?id=101890
Modified: trunk/Source/WebCore/GNUmakefile.list.am (134249 => 134250)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-11-12 17:57:43 UTC (rev 134250)
@@ -2365,7 +2365,6 @@
Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp \
Source/WebCore/bindings/js/JSSVGLengthCustom.cpp \
Source/WebCore/bindings/js/JSSVGPathSegCustom.cpp \
- Source/WebCore/bindings/js/JSScriptProfileNodeCustom.cpp \
Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp \
Source/WebCore/bindings/js/JSStorageCustom.cpp \
Source/WebCore/bindings/js/JSStorageCustom.h \
Modified: trunk/Source/WebCore/Target.pri (134249 => 134250)
--- trunk/Source/WebCore/Target.pri 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/Target.pri 2012-11-12 17:57:43 UTC (rev 134250)
@@ -172,7 +172,6 @@
bindings/js/JSPopStateEventCustom.cpp \
bindings/js/JSProcessingInstructionCustom.cpp \
bindings/js/JSRequestAnimationFrameCallbackCustom.cpp \
- bindings/js/JSScriptProfileNodeCustom.cpp \
bindings/js/JSStorageCustom.cpp \
bindings/js/JSStyleSheetCustom.cpp \
bindings/js/JSStyleSheetListCustom.cpp \
Modified: trunk/Source/WebCore/UseJSC.cmake (134249 => 134250)
--- trunk/Source/WebCore/UseJSC.cmake 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/UseJSC.cmake 2012-11-12 17:57:43 UTC (rev 134250)
@@ -123,7 +123,6 @@
bindings/js/JSPluginElementFunctions.cpp
bindings/js/JSPopStateEventCustom.cpp
bindings/js/JSProcessingInstructionCustom.cpp
- bindings/js/JSScriptProfileNodeCustom.cpp
bindings/js/JSStorageCustom.cpp
bindings/js/JSStyleSheetCustom.cpp
bindings/js/JSStyleSheetListCustom.cpp
Modified: trunk/Source/WebCore/WebCore.gypi (134249 => 134250)
--- trunk/Source/WebCore/WebCore.gypi 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/WebCore.gypi 2012-11-12 17:57:43 UTC (rev 134250)
@@ -2109,7 +2109,6 @@
'bindings/js/JSSVGElementInstanceCustom.cpp',
'bindings/js/JSSVGLengthCustom.cpp',
'bindings/js/JSSVGPathSegCustom.cpp',
- 'bindings/js/JSScriptProfileNodeCustom.cpp',
'bindings/js/JSSharedWorkerCustom.cpp',
'bindings/js/JSStorageCustom.cpp',
'bindings/js/JSStorageCustom.h',
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (134249 => 134250)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-11-12 17:57:43 UTC (rev 134250)
@@ -70002,58 +70002,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="..\bindings\js\JSScriptProfileNodeCustom.cpp"
- >
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release_Cairo_CFLite|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug_All|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Production|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\bindings\js\JSSharedWorkerCustom.cpp"
>
<FileConfiguration
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (134249 => 134250)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-11-12 17:57:43 UTC (rev 134250)
@@ -3770,7 +3770,6 @@
9F72305011184B4100AD0126 /* ScriptProfiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */; };
9F72305111184B4100AD0126 /* ScriptProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 9F72304E11184B4100AD0126 /* ScriptProfiler.h */; settings = {ATTRIBUTES = (Private, ); }; };
9FA37EE41172FC8000C4CD55 /* ScriptProfileNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 9FA37EE71172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EE61172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp */; };
9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF61172FD9300C4CD55 /* JSScriptProfile.cpp */; };
9FA37EFB1172FDA600C4CD55 /* JSScriptProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FA37EF71172FD9300C4CD55 /* JSScriptProfile.h */; };
9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FA37EF81172FD9300C4CD55 /* JSScriptProfileNode.cpp */; };
@@ -11041,7 +11040,6 @@
9F72304D11184B4100AD0126 /* ScriptProfiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptProfiler.cpp; sourceTree = "<group>"; };
9F72304E11184B4100AD0126 /* ScriptProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfiler.h; sourceTree = "<group>"; };
9FA37EE31172FC8000C4CD55 /* ScriptProfileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptProfileNode.h; sourceTree = "<group>"; };
- 9FA37EE61172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfileNodeCustom.cpp; sourceTree = "<group>"; };
9FA37EEF1172FD4100C4CD55 /* ScriptProfile.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScriptProfile.idl; sourceTree = "<group>"; };
9FA37EF01172FD4100C4CD55 /* ScriptProfileNode.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ScriptProfileNode.idl; sourceTree = "<group>"; };
9FA37EF61172FD9300C4CD55 /* JSScriptProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSScriptProfile.cpp; sourceTree = "<group>"; };
@@ -20511,7 +20509,6 @@
E1AD12D51295D0BD00ACA989 /* JSProcessingInstructionCustom.cpp */,
4998AED313FC417F0090B1AA /* JSRequestAnimationFrameCallbackCustom.cpp */,
FDEAAAFD12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp */,
- 9FA37EE61172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp */,
51DCE8010CAC9F1C00488358 /* JSSQLResultSetRowListCustom.cpp */,
1AD2316D0CD269E700C1F194 /* JSSQLTransactionCustom.cpp */,
B55D5AA71191325000BCC315 /* JSSQLTransactionSyncCustom.cpp */,
@@ -27516,7 +27513,6 @@
FDEAAAFE12B02F4900DCF33B /* JSScriptProcessorNodeCustom.cpp in Sources */,
9FA37EFA1172FDA600C4CD55 /* JSScriptProfile.cpp in Sources */,
9FA37EFC1172FDA600C4CD55 /* JSScriptProfileNode.cpp in Sources */,
- 9FA37EE71172FCF000C4CD55 /* JSScriptProfileNodeCustom.cpp in Sources */,
4A1E71A514E106AC00626F9D /* JSShadowRoot.cpp in Sources */,
41D07A7E0FF935CA0095EDCE /* JSSharedWorker.cpp in Sources */,
41D1690510238B66009BC827 /* JSSharedWorkerContext.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp (134249 => 134250)
--- trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/bindings/js/JSBindingsAllInOne.cpp 2012-11-12 17:57:43 UTC (rev 134250)
@@ -134,7 +134,6 @@
#include "JSSVGElementInstanceCustom.cpp"
#include "JSSVGLengthCustom.cpp"
#include "JSSVGPathSegCustom.cpp"
-#include "JSScriptProfileNodeCustom.cpp"
#include "JSSharedWorkerCustom.cpp"
#include "JSStorageCustom.cpp"
#include "JSStyleSheetCustom.cpp"
Deleted: trunk/Source/WebCore/bindings/js/JSScriptProfileNodeCustom.cpp (134249 => 134250)
--- trunk/Source/WebCore/bindings/js/JSScriptProfileNodeCustom.cpp 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/bindings/js/JSScriptProfileNodeCustom.cpp 2012-11-12 17:57:43 UTC (rev 134250)
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 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:
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``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 COMPUTER, INC. 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"
-
-#if ENABLE(_javascript__DEBUGGER)
-
-#include "JSScriptProfileNode.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-JSValue JSScriptProfileNode::callUID(ExecState*) const
-{
- JSValue result = jsNumber(impl()->callIdentifier().hash());
- return result;
-}
-
-} // namespace WebCore
-
-#endif
Modified: trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileNodeCustom.cpp (134249 => 134250)
--- trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileNodeCustom.cpp 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileNodeCustom.cpp 2012-11-12 17:57:43 UTC (rev 134250)
@@ -39,13 +39,6 @@
namespace WebCore {
-v8::Handle<v8::Value> V8ScriptProfileNode::callUIDAccessorGetter(v8::Local<v8::String> name, const v8::AccessorInfo& info)
-{
- INC_STATS("DOM.ScriptProfileNode.callUIDAccessorGetter");
- ScriptProfileNode* imp = V8ScriptProfileNode::toNative(info.Holder());
- return v8::Number::New(imp->callUID());
-}
-
v8::Handle<v8::Value> toV8(ScriptProfileNode* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
{
if (!impl)
Modified: trunk/Source/WebCore/inspector/ScriptProfileNode.idl (134249 => 134250)
--- trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2012-11-12 17:50:23 UTC (rev 134249)
+++ trunk/Source/WebCore/inspector/ScriptProfileNode.idl 2012-11-12 17:57:43 UTC (rev 134250)
@@ -37,6 +37,6 @@
readonly attribute unsigned long numberOfCalls;
sequence<ScriptProfileNode> children();
readonly attribute boolean visible;
- [CustomGetter] readonly attribute unsigned long callUID;
+ readonly attribute unsigned long callUID;
};
