Commit e3ec8b20 authored by dslomov@chromium.org's avatar dslomov@chromium.org

Presubmit failures fixed

TBR=vitalyr@chromium.org

Review URL: http://codereview.chromium.org/8571017

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@10003 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 237401a5
...@@ -211,13 +211,12 @@ class Genesis BASE_EMBEDDED { ...@@ -211,13 +211,12 @@ class Genesis BASE_EMBEDDED {
void InstallBuiltinFunctionIds(); void InstallBuiltinFunctionIds();
void InstallJSFunctionResultCaches(); void InstallJSFunctionResultCaches();
void InitializeNormalizedMapCaches(); void InitializeNormalizedMapCaches();
enum ExtensionTraversalState { enum ExtensionTraversalState {
UNVISITED, VISITED, INSTALLED UNVISITED, VISITED, INSTALLED
}; };
class ExtensionStates { class ExtensionStates {
DISALLOW_COPY_AND_ASSIGN(ExtensionStates);
public: public:
ExtensionStates(); ExtensionStates();
ExtensionTraversalState get_state(RegisteredExtension* extension); ExtensionTraversalState get_state(RegisteredExtension* extension);
...@@ -226,6 +225,7 @@ class Genesis BASE_EMBEDDED { ...@@ -226,6 +225,7 @@ class Genesis BASE_EMBEDDED {
private: private:
Allocator allocator_; Allocator allocator_;
HashMap map_; HashMap map_;
DISALLOW_COPY_AND_ASSIGN(ExtensionStates);
}; };
// Used both for deserialized and from-scratch contexts to add the extensions // Used both for deserialized and from-scratch contexts to add the extensions
...@@ -1989,7 +1989,8 @@ bool Genesis::InstallExtensions(Handle<Context> global_context, ...@@ -1989,7 +1989,8 @@ bool Genesis::InstallExtensions(Handle<Context> global_context,
// effort. (The external API reads 'ignore'-- does that mean // effort. (The external API reads 'ignore'-- does that mean
// we can break the interface?) // we can break the interface?)
ExtensionStates extension_states; // All extensions have state UNVISITED.
ExtensionStates extension_states; // All extensions have state UNVISITED.
// Install auto extensions. // Install auto extensions.
v8::RegisteredExtension* current = v8::RegisteredExtension::first_extension(); v8::RegisteredExtension* current = v8::RegisteredExtension::first_extension();
while (current != NULL) { while (current != NULL) {
...@@ -2036,7 +2037,7 @@ bool Genesis::InstallExtension(const char* name, ...@@ -2036,7 +2037,7 @@ bool Genesis::InstallExtension(const char* name,
} }
bool Genesis::InstallExtension(v8::RegisteredExtension* current, bool Genesis::InstallExtension(v8::RegisteredExtension* current,
ExtensionStates* extension_states) { ExtensionStates* extension_states) {
HandleScope scope; HandleScope scope;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment