[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00
yurys at chromium.org
yurys at chromium.org
Wed Mar 17 18:29:46 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit c21ebacb9aa40a6c9a8f65d100d09b7f3f5194bb
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Mar 9 17:22:25 2010 +0000
2010-03-09 Yury Semikhatsky <yurys at 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 at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55726 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2634e93..8bcfeba 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-09 Yury Semikhatsky <yurys at 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 at chromium.org>
Reviewed by Timothy Hatcher.
diff --git a/WebCore/inspector/InspectorBackend.cpp b/WebCore/inspector/InspectorBackend.cpp
index 84fea51..743a6ec 100644
--- a/WebCore/inspector/InspectorBackend.cpp
+++ b/WebCore/inspector/InspectorBackend.cpp
@@ -131,7 +131,7 @@ void InspectorBackend::getResourceContent(long callId, unsigned long identifier)
void InspectorBackend::reloadPage()
{
if (m_inspectorController)
- m_inspectorController->m_inspectedPage->mainFrame()->loader()->reload();
+ m_inspectorController->m_inspectedPage->mainFrame()->redirectScheduler()->scheduleRefresh(true);
}
void InspectorBackend::startTimelineProfiler()
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 66e5541..90fdff9 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -1119,7 +1119,7 @@ void InspectorController::enableResourceTracking(bool always, bool reload)
m_frontend->resourceTrackingWasEnabled();
if (reload)
- m_inspectedPage->mainFrame()->loader()->reload();
+ m_inspectedPage->mainFrame()->redirectScheduler()->scheduleRefresh(true);
}
void InspectorController::disableResourceTracking(bool always)
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e4eb306..c270787 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-03-09 Yury Semikhatsky <yurys at 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 at apple.com>
Chromium build fix.
diff --git a/WebKit/chromium/src/DebuggerAgentImpl.cpp b/WebKit/chromium/src/DebuggerAgentImpl.cpp
index dad804a..c489860 100644
--- a/WebKit/chromium/src/DebuggerAgentImpl.cpp
+++ b/WebKit/chromium/src/DebuggerAgentImpl.cpp
@@ -36,9 +36,6 @@
#include "Frame.h"
#include "Page.h"
#include "V8Binding.h"
-#include "V8DOMWindow.h"
-#include "V8Index.h"
-#include "V8Proxy.h"
#include "WebDevToolsAgentImpl.h"
#include "WebViewImpl.h"
#include <wtf/HashSet.h>
@@ -50,10 +47,6 @@ using WebCore::Document;
using WebCore::Frame;
using WebCore::Page;
using WebCore::String;
-using WebCore::V8ClassIndex;
-using WebCore::V8DOMWindow;
-using WebCore::V8DOMWrapper;
-using WebCore::V8Proxy;
namespace WebKit {
@@ -91,58 +84,6 @@ void DebuggerAgentImpl::debuggerOutput(const String& 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);
-}
-
String DebuggerAgentImpl::executeUtilityFunction(
v8::Handle<v8::Context> context,
int callId,
diff --git a/WebKit/chromium/src/DebuggerAgentImpl.h b/WebKit/chromium/src/DebuggerAgentImpl.h
index 6eaf576..0e6e6af 100644
--- a/WebKit/chromium/src/DebuggerAgentImpl.h
+++ b/WebKit/chromium/src/DebuggerAgentImpl.h
@@ -52,9 +52,6 @@ class WebViewImpl;
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,
WebDevToolsAgentImpl* webdevtoolsAgent);
diff --git a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
index a38b39a..20c3c75 100644
--- a/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
+++ b/WebKit/chromium/src/WebDevToolsAgentImpl.cpp
@@ -361,7 +361,7 @@ v8::Local<v8::Object> WebDevToolsAgentImpl::createInspectorBackendV8Wrapper()
void WebDevToolsAgentImpl::resetInspectorFrontendProxy()
{
disposeUtilityContext();
- m_debuggerAgentImpl->createUtilityContext(m_webViewImpl->page()->mainFrame(), &m_utilityContext);
+ m_utilityContext = v8::Context::New();
compileUtilityScripts();
initDevToolsAgentHost();
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list