| Index: webkit/port/bindings/v8/v8_proxy.cpp
|
| ===================================================================
|
| --- webkit/port/bindings/v8/v8_proxy.cpp (revision 14255)
|
| +++ webkit/port/bindings/v8/v8_proxy.cpp (working copy)
|
| @@ -44,7 +44,7 @@
|
|
|
| #include "ChromiumBridge.h"
|
| #include "DOMObjectsInclude.h"
|
| -
|
| +#include "DocumentLoader.h"
|
| #include "ScriptController.h"
|
| #include "V8DOMMap.h"
|
|
|
| @@ -1962,7 +1962,7 @@
|
| 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();
|
| @@ -3165,7 +3165,7 @@
|
| 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.
|
|
|