Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: Source/bindings/v8/V8ObjectConstructor.cpp

Issue 208263004: Move TraceEvent.h from platform/ to wtf/ Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "config.h" 25 #include "config.h"
26 #include "bindings/v8/V8ObjectConstructor.h" 26 #include "bindings/v8/V8ObjectConstructor.h"
27 27
28 #include "bindings/v8/V8Binding.h" 28 #include "bindings/v8/V8Binding.h"
29 #include "bindings/v8/V8ScriptRunner.h" 29 #include "bindings/v8/V8ScriptRunner.h"
30 #include "core/dom/Document.h" 30 #include "core/dom/Document.h"
31 #include "core/frame/LocalFrame.h" 31 #include "core/frame/LocalFrame.h"
32 #include "platform/TraceEvent.h" 32 #include "wtf/TraceEvent.h"
33
34 33
35 namespace WebCore { 34 namespace WebCore {
36 35
37 v8::Local<v8::Object> V8ObjectConstructor::newInstance(v8::Handle<v8::Function> function) 36 v8::Local<v8::Object> V8ObjectConstructor::newInstance(v8::Handle<v8::Function> function)
38 { 37 {
39 if (function.IsEmpty()) 38 if (function.IsEmpty())
40 return v8::Local<v8::Object>(); 39 return v8::Local<v8::Object>();
41 ConstructorMode constructorMode; 40 ConstructorMode constructorMode;
42 return V8ScriptRunner::instantiateObject(function); 41 return V8ScriptRunner::instantiateObject(function);
43 } 42 }
(...skipping 24 matching lines...) Expand all
68 void V8ObjectConstructor::isValidConstructorMode(const v8::FunctionCallbackInfo< v8::Value>& info) 67 void V8ObjectConstructor::isValidConstructorMode(const v8::FunctionCallbackInfo< v8::Value>& info)
69 { 68 {
70 if (ConstructorMode::current() == ConstructorMode::CreateNewObject) { 69 if (ConstructorMode::current() == ConstructorMode::CreateNewObject) {
71 throwTypeError("Illegal constructor", info.GetIsolate()); 70 throwTypeError("Illegal constructor", info.GetIsolate());
72 return; 71 return;
73 } 72 }
74 v8SetReturnValue(info, info.This()); 73 v8SetReturnValue(info, info.This());
75 } 74 }
76 75
77 } // namespace WebCore 76 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698