summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 18:19:36 +0000
committerfqian@google.com <fqian@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-03 18:19:36 +0000
commitdb8a5a4a95416ecf33edaf227793ef2353613b3c (patch)
tree4962f9348750f160ee009c2e4c08435c6a78738d
parent821f5033f67770169280954bc87f501f4ae67203 (diff)
downloadchromium_src-db8a5a4a95416ecf33edaf227793ef2353613b3c.zip
chromium_src-db8a5a4a95416ecf33edaf227793ef2353613b3c.tar.gz
chromium_src-db8a5a4a95416ecf33edaf227793ef2353613b3c.tar.bz2
Rename ScriptController::notifyDOMWindowReady() to windowObjectAvailable().
Remove unnecessary calls to dispatchWindowObjectReady. FrameLoader calls the function. Review URL: http://codereview.chromium.org/9247 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4460 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/port/bindings/v8/ScriptController.h2
-rw-r--r--webkit/port/bindings/v8/v8_proxy.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/webkit/port/bindings/v8/ScriptController.h b/webkit/port/bindings/v8/ScriptController.h
index d23ca65..e41aabd 100644
--- a/webkit/port/bindings/v8/ScriptController.h
+++ b/webkit/port/bindings/v8/ScriptController.h
@@ -232,7 +232,7 @@ public:
void clearWindowShell();
void updateDocument();
- void notifyDOMWindowReady() { m_proxy->domWindowReady(); }
+ void windowObjectAvailable() { m_proxy->domWindowReady(); }
void pauseTimeouts(OwnPtr<PausedTimeouts>&);
void resumeTimeouts(OwnPtr<PausedTimeouts>&);
diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp
index fb92d44..f0e48cc 100644
--- a/webkit/port/bindings/v8/v8_proxy.cpp
+++ b/webkit/port/bindings/v8/v8_proxy.cpp
@@ -1863,8 +1863,6 @@ void V8Proxy::initContextIfNeeded()
// Setup security origin and security token
GenerateSecurityToken(context);
- V8Proxy::retrieveFrame(context)->loader()->dispatchWindowObjectAvailable();
-
if (ScriptController::RecordPlaybackMode()) {
// Inject code which overrides a few common JS functions for implementing
// randomness. In order to implement effective record & playback of