When doing the scheme check for applying V8 extensions, check against the...

webkit/port/bindings/v8/v8_proxy.cpp

 // Copyright (c) 2008, 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 26 matching lines @@
 
 #include "v8_proxy.h"
 #include "v8_index.h"
 #include "v8_binding.h"
 #include "v8_custom.h"
 #include "V8Collection.h"
 #include "V8DOMWindow.h"
 
 #include "ChromiumBridge.h"
 #include "DOMObjectsInclude.h"
-
+#include "DocumentLoader.h"
 #include "ScriptController.h"
 #include "V8DOMMap.h"
 
 namespace WebCore {
 
 // Static utility context.
 v8::Persistent<v8::Context> V8Proxy::m_utilityContext;
 
 // Static list of registered extensions
 V8ExtensionList V8Proxy::m_extensions;
@@ skipping 1897 matching lines @@
         V8Custom::v8DOMWindowNamedSecurityCheck,
         V8Custom::v8DOMWindowIndexedSecurityCheck,
         v8::Integer::New(V8ClassIndex::DOMWINDOW));
 
     // Dynamically tell v8 about our extensions now.
     const char** extensionNames = new const char*[m_extensions.size()];
     int index = 0;
     for (V8ExtensionList::iterator it = m_extensions.begin();
          it != m_extensions.end(); ++it) {
         if (it->scheme.length() > 0 &&
-            it->scheme != m_frame->document()->url().protocol())
+            it->scheme != m_frame->loader()->activeDocumentLoader()->url().protocol())
             continue;
 
         extensionNames[index++] = it->extension->name();
     }
     v8::ExtensionConfiguration extensions(index, extensionNames);
     result = v8::Context::New(&extensions, globalTemplate, global);
     delete [] extensionNames;
     extensionNames = 0;
 
     return result;
@@ skipping 1182 matching lines @@
 v8::Handle<v8::Value> V8Proxy::WindowToV8Object(DOMWindow* window)
 {
     if (!window) return v8::Null();
     // Initializes environment of a frame, and return the global object
     // of the frame.
     Frame* frame = window->frame();
     if (!frame)
         return v8::Handle<v8::Object>();
 
     // Special case: Because of evaluateInNewContext() one DOMWindow can have
-    // multipe contexts and multiple global objects associated with it. When
+    // multiple contexts and multiple global objects associated with it. When
     // code running in one of those contexts accesses the window object, we
     // want to return the global object associated with that context, not
     // necessarily the first global object associated with that DOMWindow.
     v8::Handle<v8::Context> current_context = v8::Context::GetCurrent();
     v8::Handle<v8::Object> current_global = current_context->Global();
     v8::Handle<v8::Object> windowWrapper =
         LookupDOMWrapper(V8ClassIndex::DOMWINDOW, current_global);
     if (!windowWrapper.IsEmpty())
         if (DOMWrapperToNative<DOMWindow>(windowWrapper) == window)
             return current_global;
@@ skipping 104 matching lines @@
 }
 
 void V8Proxy::RegisterExtension(v8::Extension* extension,
                                 const String& schemeRestriction) {
     v8::RegisterExtension(extension);
     V8ExtensionInfo info = {schemeRestriction, extension};
     m_extensions.push_back(info);
 }
 
 }  // namespace WebCore