Revision: 17325
Author: [email protected]
Date: Tue Oct 22 15:46:15 2013 UTC
Log: Revert "Expose v8::Function::GetDisplayName to public API."
This reverts commit 54c7b9af65dd349405944bd9ae2f064202dc6e1d.
The new test fails in debug mode.
BUG=chromium:17356
[email protected]
Review URL: https://codereview.chromium.org/30443006
http://code.google.com/p/v8/source/detail?r=17325
Modified:
/branches/bleeding_edge/include/v8.h
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/test/cctest/test-api.cc
=======================================
--- /branches/bleeding_edge/include/v8.h Tue Oct 22 14:57:19 2013 UTC
+++ /branches/bleeding_edge/include/v8.h Tue Oct 22 15:46:15 2013 UTC
@@ -2478,12 +2478,6 @@
*/
Handle<Value> GetInferredName() const;
- /**
- * User-defined name assigned to the "displayName" property of this
function.
- * Used to facilitate debugging and profiling of JavaScript code.
- */
- Handle<Value> GetDisplayName() const;
-
/**
* Returns zero based line number of function body and
* kLineOffsetNotFound if no information available.
=======================================
--- /branches/bleeding_edge/src/api.cc Tue Oct 22 14:57:19 2013 UTC
+++ /branches/bleeding_edge/src/api.cc Tue Oct 22 15:46:15 2013 UTC
@@ -4108,30 +4108,6 @@
return
Utils::ToLocal(i::Handle<i::Object>(func->shared()->inferred_name(),
func->GetIsolate()));
}
-
-
-Handle<Value> Function::GetDisplayName() const {
- i::Isolate* isolate = Utils::OpenHandle(this)->GetIsolate();
- ON_BAILOUT(isolate, "v8::Function::GetDisplayName()",
- return ToApiHandle<Primitive>(
- isolate->factory()->undefined_value()));
- ENTER_V8(isolate);
- i::HandleScope scope(isolate);
- i::Handle<i::JSFunction> func = Utils::OpenHandle(this);
- i::Handle<i::String> property_name =
- isolate->factory()->InternalizeOneByteString(
- STATIC_ASCII_VECTOR("displayName"));
- i::LookupResult lookup(isolate);
- func->LookupRealNamedProperty(*property_name, &lookup);
- if (lookup.IsFound()) {
- i::Object* value = lookup.GetLazyValue();
- if (value && value->IsString()) {
- i::String* name = i::String::cast(value);
- if (name->length() > 0) return
Utils::ToLocal(i::Handle<i::String>(name));
- }
- }
- return ToApiHandle<Primitive>(isolate->factory()->undefined_value());
-}
ScriptOrigin Function::GetScriptOrigin() const {
=======================================
--- /branches/bleeding_edge/test/cctest/test-api.cc Tue Oct 22 14:57:19
2013 UTC
+++ /branches/bleeding_edge/test/cctest/test-api.cc Tue Oct 22 15:46:15
2013 UTC
@@ -17502,77 +17502,6 @@
env->Global()->Get(v8::String::New("f")));
CHECK_EQ("foo.bar.baz", *v8::String::Utf8Value(f->GetInferredName()));
}
-
-
-THREADED_TEST(FunctionGetDisplayName) {
- LocalContext env;
- v8::HandleScope scope(env->GetIsolate());
- const char* code = "var error = false;"
- "function a() { this.x = 1; };"
- "a.displayName = 'display_a';"
- "var b = (function() {"
- " var f = function() { this.x = 2; };"
- " f.displayName = 'display_b';"
- " return f;"
- "})();"
- "var c = function() {};"
- "c.__defineGetter__('displayName', function() {"
- " error = true;"
- " throw new Error();"
- "});"
- "function d() {};"
- "d.__defineGetter__('displayName', function() {"
- " error = true;"
- " return 'wrong_display_name';"
- "});"
- "function e() {};"
- "e.displayName = 'wrong_display_name';"
- "e.__defineSetter__('displayName', function() {"
- " error = true;"
- " throw new Error();"
- "});"
- "function f() {};"
- "f.displayName = { 'foo': 6, toString: function() {"
- " error = true;"
- " return 'wrong_display_name';"
- "}};"
- "var g = function() {"
- " arguments.callee.displayName = 'set_in_runtime';"
- "}; g();"
- "a.prototype.displayName = 'prototype_display_a';"
- "var hClass = function() {};"
- "hClass.prototype.__proto__ = a.prototype;"
- "var h = new hClass();"
- ;
- v8::ScriptOrigin origin = v8::ScriptOrigin(v8::String::New("test"));
- v8::Script::Compile(v8::String::New(code), &origin)->Run();
- v8::Local<v8::Value> error =
env->Global()->Get(v8::String::New("error"));
- v8::Local<v8::Function> a = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("a")));
- v8::Local<v8::Function> b = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("b")));
- v8::Local<v8::Function> c = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("c")));
- v8::Local<v8::Function> d = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("d")));
- v8::Local<v8::Function> e = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("e")));
- v8::Local<v8::Function> f = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("f")));
- v8::Local<v8::Function> g = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("g")));
- v8::Local<v8::Function> h = v8::Local<v8::Function>::Cast(
- env->Global()->Get(v8::String::New("h")));
- CHECK_EQ(false, error->BooleanValue());
- CHECK_EQ("display_a", *v8::String::Utf8Value(a->GetDisplayName()));
- CHECK_EQ("display_b", *v8::String::Utf8Value(b->GetDisplayName()));
- CHECK(c->GetDisplayName()->IsUndefined());
- CHECK(d->GetDisplayName()->IsUndefined());
- CHECK(e->GetDisplayName()->IsUndefined());
- CHECK(f->GetDisplayName()->IsUndefined());
- CHECK_EQ("set_in_runtime", *v8::String::Utf8Value(g->GetDisplayName()));
- CHECK_EQ("prototype_display_a",
*v8::String::Utf8Value(h->GetDisplayName()));
-}
THREADED_TEST(ScriptLineNumber) {
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
