Changeset 55726 in webkit

Timestamp:

Mar 9, 2010 9:22:25 AM (14 years ago)

Author:

yurys@chromium.org

Message:

2010-03-09 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

When enable resource tracking state changes use the same method as
location.reload for reloading inspected page.

​https://bugs.webkit.org/show_bug.cgi?id=35923

• inspector/InspectorBackend.cpp: (WebCore::InspectorBackend::reloadPage):
• inspector/InspectorController.cpp: (WebCore::InspectorController::enableResourceTracking):

2010-03-09 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

Use clean global object for devtools utility context instead of
trying to simulate inspected context.

​https://bugs.webkit.org/show_bug.cgi?id=35923

• src/DebuggerAgentImpl.cpp:
• src/DebuggerAgentImpl.h:
• src/WebDevToolsAgentImpl.cpp: (WebKit::WebDevToolsAgentImpl::resetInspectorFrontendProxy):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/inspector/InspectorBackend.cpp (modified) (1 diff)
• WebCore/inspector/InspectorController.cpp (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/DebuggerAgentImpl.cpp (modified) (3 diffs)
• WebKit/chromium/src/DebuggerAgentImpl.h (modified) (1 diff)
• WebKit/chromium/src/WebDevToolsAgentImpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-09  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+ 
+        When enable resource tracking state changes use the same method as
+        location.reload for reloading inspected page.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35923
+
+        * inspector/InspectorBackend.cpp:
+        (WebCore::InspectorBackend::reloadPage):
+        * inspector/InspectorController.cpp:
+        (WebCore::InspectorController::enableResourceTracking):
+
 2010-03-09  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/inspector/InspectorBackend.cpp

@@ -132 +132 @@
 {
     if (m_inspectorController)
-        m_inspectorController->m_inspectedPage->mainFrame()->loader()->reload();
+        m_inspectorController->m_inspectedPage->mainFrame()->redirectScheduler()->scheduleRefresh(true);
 }
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -1120 +1120 @@
 
     if (reload)
-        m_inspectedPage->mainFrame()->loader()->reload();
+        m_inspectedPage->mainFrame()->redirectScheduler()->scheduleRefresh(true);
 }
 

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-09  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        Use clean global object for devtools utility context instead of
+        trying to simulate inspected context. 
+    
+        https://bugs.webkit.org/show_bug.cgi?id=35923
+
+        * src/DebuggerAgentImpl.cpp:
+        * src/DebuggerAgentImpl.h:
+        * src/WebDevToolsAgentImpl.cpp:
+        (WebKit::WebDevToolsAgentImpl::resetInspectorFrontendProxy):
+
 2010-03-08  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKit/chromium/src/DebuggerAgentImpl.cpp

@@ -37 +37 @@
 #include "Page.h"
 #include "V8Binding.h"
-#include "V8DOMWindow.h"
-#include "V8Index.h"
-#include "V8Proxy.h"
 #include "WebDevToolsAgentImpl.h"
 #include "WebViewImpl.h"
@@ -51 +48 @@
 using WebCore::Page;
 using WebCore::String;
-using WebCore::V8ClassIndex;
-using WebCore::V8DOMWindow;
-using WebCore::V8DOMWrapper;
-using WebCore::V8Proxy;
 
 namespace WebKit {
@@ -90 +83 @@
     m_delegate->debuggerOutput(command);
     m_webdevtoolsAgent->forceRepaint();
-}
-
-// static
-void DebuggerAgentImpl::createUtilityContext(Frame* frame, v8::Persistent<v8::Context>* context)
-{
-    v8::HandleScope scope;
-    bool canExecuteScripts = frame->script()->canExecuteScripts(WebCore::NotAboutToExecuteScript);
-
-    // Set up the DOM window as the prototype of the new global object.
-    v8::Handle<v8::Context> windowContext = V8Proxy::context(frame);
-    v8::Handle<v8::Object> windowGlobal;
-    v8::Handle<v8::Object> windowWrapper;
-    if (canExecuteScripts) {
-        // FIXME: This check prevents renderer from crashing, while providing limited capabilities for
-        // DOM inspection, Resources tracking, no scripts support, some timeline profiling. Console will
-        // result in exceptions for each evaluation. There is still some work that needs to be done in
-        // order to polish the script-less experience.
-        windowGlobal = windowContext->Global();
-        windowWrapper = V8DOMWrapper::lookupDOMWrapper(V8DOMWindow::GetTemplate(), windowGlobal);
-        ASSERT(V8DOMWindow::toNative(windowWrapper) == frame->domWindow());
-    }
-
-    v8::Handle<v8::ObjectTemplate> globalTemplate = v8::ObjectTemplate::New();
-
-    // TODO(yurys): provide a function in v8 bindings that would make the
-    // utility context more like main world context of the inspected frame,
-    // otherwise we need to manually make it satisfy various invariants
-    // that V8Proxy::getEntered and some other V8Proxy methods expect to find
-    // on v8 contexts on the contexts stack.
-    // See V8Proxy::createNewContext.
-    //
-    // Install a security handler with V8.
-    globalTemplate->SetAccessCheckCallbacks(
-        V8DOMWindow::namedSecurityCheck,
-        V8DOMWindow::indexedSecurityCheck,
-        v8::Integer::New(V8ClassIndex::DOMWINDOW));
-    // We set number of internal fields to match that in V8DOMWindow wrapper.
-    // See http://crbug.com/28961
-    globalTemplate->SetInternalFieldCount(V8DOMWindow::internalFieldCount);
-
-    *context = v8::Context::New(0 /* no extensions */, globalTemplate, v8::Handle<v8::Object>());
-    v8::Context::Scope contextScope(*context);
-    v8::Handle<v8::Object> global = (*context)->Global();
-
-    v8::Handle<v8::String> implicitProtoString = v8::String::New("__proto__");
-    if (canExecuteScripts)
-        global->Set(implicitProtoString, windowWrapper);
-
-    // Give the code running in the new context a way to get access to the
-    // original context.
-    if (canExecuteScripts)
-        global->Set(v8::String::New("contentWindow"), windowGlobal);
 }
 

trunk/WebKit/chromium/src/DebuggerAgentImpl.h

@@ -53 +53 @@
 class DebuggerAgentImpl : public DebuggerAgent {
 public:
-    // Creates utility context with injected js agent.
-    static void createUtilityContext(WebCore::Frame* frame, v8::Persistent<v8::Context>* context);
-
     DebuggerAgentImpl(WebKit::WebViewImpl* webViewImpl,
                       DebuggerAgentDelegate* delegate,

trunk/WebKit/chromium/src/WebDevToolsAgentImpl.cpp

@@ -362 +362 @@
 {
     disposeUtilityContext();
-    m_debuggerAgentImpl->createUtilityContext(m_webViewImpl->page()->mainFrame(), &m_utilityContext);
+    m_utilityContext = v8::Context::New();
     compileUtilityScripts();
     initDevToolsAgentHost();