- Revision
- 140295
- Author
- [email protected]
- Date
- 2013-01-20 22:08:05 -0800 (Sun, 20 Jan 2013)
Log Message
[V8] Remove custom V8ScriptProfileCustom::toV8()
https://bugs.webkit.org/show_bug.cgi?id=107246
Reviewed by Adam Barth.
V8ScriptProfileCustom::toV8() needs not to be custom.
Furthermore, the current custom toV8() is wrong in that
it doesn't use a creationContext and it doesn't set a
wrapper class id. This is one of steps to avoiding
ASSERT()s that will be added in
https://bugs.webkit.org/show_bug.cgi?id=107137 .
No tests. No change in behavior.
* UseV8.cmake:
* WebCore.gypi:
* bindings/v8/custom/V8ScriptProfileCustom.cpp: Removed.
* inspector/ScriptProfile.idl:
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140294 => 140295)
--- trunk/Source/WebCore/ChangeLog 2013-01-21 05:42:11 UTC (rev 140294)
+++ trunk/Source/WebCore/ChangeLog 2013-01-21 06:08:05 UTC (rev 140295)
@@ -1,3 +1,24 @@
+2013-01-20 Kentaro Hara <[email protected]>
+
+ [V8] Remove custom V8ScriptProfileCustom::toV8()
+ https://bugs.webkit.org/show_bug.cgi?id=107246
+
+ Reviewed by Adam Barth.
+
+ V8ScriptProfileCustom::toV8() needs not to be custom.
+ Furthermore, the current custom toV8() is wrong in that
+ it doesn't use a creationContext and it doesn't set a
+ wrapper class id. This is one of steps to avoiding
+ ASSERT()s that will be added in
+ https://bugs.webkit.org/show_bug.cgi?id=107137 .
+
+ No tests. No change in behavior.
+
+ * UseV8.cmake:
+ * WebCore.gypi:
+ * bindings/v8/custom/V8ScriptProfileCustom.cpp: Removed.
+ * inspector/ScriptProfile.idl:
+
2013-01-20 Sheriff Bot <[email protected]>
Unreviewed, rolling out r140290.
Modified: trunk/Source/WebCore/UseV8.cmake (140294 => 140295)
--- trunk/Source/WebCore/UseV8.cmake 2013-01-21 05:42:11 UTC (rev 140294)
+++ trunk/Source/WebCore/UseV8.cmake 2013-01-21 06:08:05 UTC (rev 140295)
@@ -178,7 +178,6 @@
bindings/v8/ScriptProfiler.cpp
bindings/v8/custom/V8JavaScriptCallFrameCustom.cpp
- bindings/v8/custom/V8ScriptProfileCustom.cpp
)
endif ()
Modified: trunk/Source/WebCore/WebCore.gypi (140294 => 140295)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-21 05:42:11 UTC (rev 140294)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-21 06:08:05 UTC (rev 140295)
@@ -1385,7 +1385,6 @@
'bindings/v8/custom/V8SVGElementCustom.cpp',
'bindings/v8/custom/V8SVGLengthCustom.cpp',
'bindings/v8/custom/V8SVGPathSegCustom.cpp',
- 'bindings/v8/custom/V8ScriptProfileCustom.cpp',
'bindings/v8/custom/V8StorageCustom.cpp',
'bindings/v8/custom/V8StyleSheetCustom.cpp',
'bindings/v8/custom/V8StyleSheetListCustom.cpp',
Deleted: trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileCustom.cpp (140294 => 140295)
--- trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileCustom.cpp 2013-01-21 05:42:11 UTC (rev 140294)
+++ trunk/Source/WebCore/bindings/v8/custom/V8ScriptProfileCustom.cpp 2013-01-21 06:08:05 UTC (rev 140295)
@@ -1,66 +0,0 @@
-/*
- * 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:
- *
- * * 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"
-#if ENABLE(_javascript__DEBUGGER)
-#include "V8ScriptProfile.h"
-
-#include "ScriptProfile.h"
-#include "V8Binding.h"
-
-#include <v8-profiler.h>
-
-namespace WebCore {
-
-v8::Handle<v8::Value> toV8(ScriptProfile* impl, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
-{
- if (!impl)
- return v8NullWithCheck(isolate);
-
- // FIXME: Use creationContext.
-
- v8::Local<v8::Function> function = V8ScriptProfile::GetTemplate()->GetFunction();
- if (function.IsEmpty()) {
- // Return if allocation failed.
- return v8Undefined();
- }
- v8::Local<v8::Object> instance = V8ObjectConstructor::newInstance(function);
- if (instance.IsEmpty()) {
- // Avoid setting the wrapper if allocation failed.
- return v8Undefined();
- }
- impl->ref();
- V8DOMWrapper::setNativeInfo(instance, &V8ScriptProfile::info, impl);
- return instance;
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(_javascript__DEBUGGER)
Modified: trunk/Source/WebCore/inspector/ScriptProfile.idl (140294 => 140295)
--- trunk/Source/WebCore/inspector/ScriptProfile.idl 2013-01-21 05:42:11 UTC (rev 140294)
+++ trunk/Source/WebCore/inspector/ScriptProfile.idl 2013-01-21 06:08:05 UTC (rev 140295)
@@ -26,9 +26,7 @@
[
Conditional=_javascript__DEBUGGER,
- OmitConstructor,
- V8CustomToJSObject,
- V8NoWrapperCache
+ OmitConstructor
] interface ScriptProfile {
readonly attribute DOMString title;
readonly attribute unsigned long uid;
