| Index: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| index 1ec2a765cac93a1a2b36879178dd9ab9dd00a619..732552a49e85786b598c8398dfa81cc36fc6811f 100644
|
| --- a/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
|
| @@ -781,25 +781,6 @@ void WebLocalFrameImpl::dispatchUnloadEvent()
|
| frame()->loader().dispatchUnloadEvent();
|
| }
|
|
|
| -NPObject* WebLocalFrameImpl::windowObject() const
|
| -{
|
| - if (!frame() || ScriptForbiddenScope::isScriptForbidden())
|
| - return 0;
|
| - return frame()->script().windowScriptNPObject();
|
| -}
|
| -
|
| -void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* object)
|
| -{
|
| - bindToWindowObject(name, object, 0);
|
| -}
|
| -
|
| -void WebLocalFrameImpl::bindToWindowObject(const WebString& name, NPObject* object, void*)
|
| -{
|
| - if (!frame() || !frame()->script().canExecuteScripts(NotAboutToExecuteScript))
|
| - return;
|
| - frame()->script().bindToWindowObject(frame(), String(name), object);
|
| -}
|
| -
|
| void WebLocalFrameImpl::executeScript(const WebScriptSource& source)
|
| {
|
| ASSERT(frame());
|
|
|