Merge 68061 - 2010-09-22 Matt Perry <mpcomplete@chromium.org>...

WebCore/bindings/v8/V8Proxy.cpp

 /*
  * Copyright (C) 2008, 2009 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
@@ skipping 823 matching lines @@
         if (m_extensions[i].extension == extension)
             return true;
     }
 
     return false;
 }
 
 void V8Proxy::registerExtension(v8::Extension* extension, const String& schemeRestriction)
 {
     registerExtensionWithV8(extension);
-    V8ExtensionInfo info = {schemeRestriction, 0, extension};
+    V8ExtensionInfo info = {schemeRestriction, 0, extension, false};
     m_extensions.append(info);
 }
 
 void V8Proxy::registerExtension(v8::Extension* extension, int extensionGroup)
 {
     registerExtensionWithV8(extension);
-    V8ExtensionInfo info = {String(), extensionGroup, extension};
+    V8ExtensionInfo info = {String(), extensionGroup, extension, false};
+    m_extensions.append(info);
+}
+
+void V8Proxy::registerExtension(v8::Extension* extension)
+{
+    registerExtensionWithV8(extension);
+    V8ExtensionInfo info = {String(), 0, extension, true};
     m_extensions.append(info);
 }
 
 bool V8Proxy::setContextDebugId(int debugId)
 {
     ASSERT(debugId > 0);
     v8::HandleScope scope;
     v8::Handle<v8::Context> context = windowShell()->context();
     if (context.IsEmpty())
         return false;
@@ skipping 29 matching lines @@
 #if ENABLE(WORKERS)
     } else if (context->isWorkerContext()) {
         if (WorkerContextExecutionProxy* proxy = static_cast<WorkerContext*>(context)->script()->proxy())
             return proxy->context();
 #endif
     }
     return v8::Local<v8::Context>();
 }
 
 }  // namespace WebCore