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

Side by Side Diff: third_party/WebKit/Source/bindings/core/v8/V8PerIsolateData.h

Issue 1497503002: Removes the custom toString callback for the various DOM constructors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Created 5 years 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 static void willBeDestroyed(v8::Isolate*); 72 static void willBeDestroyed(v8::Isolate*);
73 static void destroy(v8::Isolate*); 73 static void destroy(v8::Isolate*);
74 static v8::Isolate* mainThreadIsolate(); 74 static v8::Isolate* mainThreadIsolate();
75 75
76 static void enableIdleTasks(v8::Isolate*, PassOwnPtr<gin::V8IdleTaskRunner>) ; 76 static void enableIdleTasks(v8::Isolate*, PassOwnPtr<gin::V8IdleTaskRunner>) ;
77 77
78 bool destructionPending() const { return m_destructionPending; } 78 bool destructionPending() const { return m_destructionPending; }
79 v8::Isolate* isolate() { return m_isolateHolder->isolate(); } 79 v8::Isolate* isolate() { return m_isolateHolder->isolate(); }
80 80
81 v8::Local<v8::FunctionTemplate> toStringTemplate();
82
83 StringCache* stringCache() { return m_stringCache.get(); } 81 StringCache* stringCache() { return m_stringCache.get(); }
84 82
85 v8::Persistent<v8::Value>& ensureLiveRoot(); 83 v8::Persistent<v8::Value>& ensureLiveRoot();
86 84
87 int recursionLevel() const { return m_recursionLevel; } 85 int recursionLevel() const { return m_recursionLevel; }
88 int incrementRecursionLevel() { return ++m_recursionLevel; } 86 int incrementRecursionLevel() { return ++m_recursionLevel; }
89 int decrementRecursionLevel() { return --m_recursionLevel; } 87 int decrementRecursionLevel() { return --m_recursionLevel; }
90 bool isHandlingRecursionLevelError() const { return m_isHandlingRecursionLev elError; } 88 bool isHandlingRecursionLevelError() const { return m_isHandlingRecursionLev elError; }
91 void setIsHandlingRecursionLevelError(bool value) { m_isHandlingRecursionLev elError = value; } 89 void setIsHandlingRecursionLevelError(bool value) { m_isHandlingRecursionLev elError = value; }
92 90
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 131
134 typedef HashMap<const void*, v8::Eternal<v8::FunctionTemplate>> DOMTemplateM ap; 132 typedef HashMap<const void*, v8::Eternal<v8::FunctionTemplate>> DOMTemplateM ap;
135 DOMTemplateMap& currentDOMTemplateMap(); 133 DOMTemplateMap& currentDOMTemplateMap();
136 bool hasInstance(const WrapperTypeInfo* untrusted, v8::Local<v8::Value>, DOM TemplateMap&); 134 bool hasInstance(const WrapperTypeInfo* untrusted, v8::Local<v8::Value>, DOM TemplateMap&);
137 v8::Local<v8::Object> findInstanceInPrototypeChain(const WrapperTypeInfo*, v 8::Local<v8::Value>, DOMTemplateMap&); 135 v8::Local<v8::Object> findInstanceInPrototypeChain(const WrapperTypeInfo*, v 8::Local<v8::Value>, DOMTemplateMap&);
138 136
139 bool m_destructionPending; 137 bool m_destructionPending;
140 OwnPtr<gin::IsolateHolder> m_isolateHolder; 138 OwnPtr<gin::IsolateHolder> m_isolateHolder;
141 DOMTemplateMap m_domTemplateMapForMainWorld; 139 DOMTemplateMap m_domTemplateMapForMainWorld;
142 DOMTemplateMap m_domTemplateMapForNonMainWorld; 140 DOMTemplateMap m_domTemplateMapForNonMainWorld;
143 ScopedPersistent<v8::FunctionTemplate> m_toStringTemplate;
144 OwnPtr<StringCache> m_stringCache; 141 OwnPtr<StringCache> m_stringCache;
145 OwnPtr<V8HiddenValue> m_hiddenValue; 142 OwnPtr<V8HiddenValue> m_hiddenValue;
146 ScopedPersistent<v8::Value> m_liveRoot; 143 ScopedPersistent<v8::Value> m_liveRoot;
147 RefPtr<ScriptState> m_scriptRegexpScriptState; 144 RefPtr<ScriptState> m_scriptRegexpScriptState;
148 145
149 const char* m_previousSamplingState; 146 const char* m_previousSamplingState;
150 147
151 bool m_constructorMode; 148 bool m_constructorMode;
152 friend class ConstructorMode; 149 friend class ConstructorMode;
153 150
154 int m_recursionLevel; 151 int m_recursionLevel;
155 bool m_isHandlingRecursionLevelError; 152 bool m_isHandlingRecursionLevelError;
156 bool m_isReportingException; 153 bool m_isReportingException;
157 154
158 #if ENABLE(ASSERT) 155 #if ENABLE(ASSERT)
159 int m_internalScriptRecursionLevel; 156 int m_internalScriptRecursionLevel;
160 #endif 157 #endif
161 bool m_performingMicrotaskCheckpoint; 158 bool m_performingMicrotaskCheckpoint;
162 159
163 Vector<OwnPtr<EndOfScopeTask>> m_endOfScopeTasks; 160 Vector<OwnPtr<EndOfScopeTask>> m_endOfScopeTasks;
164 OwnPtr<ScriptDebuggerBase> m_scriptDebugger; 161 OwnPtr<ScriptDebuggerBase> m_scriptDebugger;
165 }; 162 };
166 163
167 } // namespace blink 164 } // namespace blink
168 165
169 #endif // V8PerIsolateData_h 166 #endif // V8PerIsolateData_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698