summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/common/child_thread.cc6
-rw-r--r--chrome/common/child_thread.h2
-rw-r--r--chrome/common/message_router.cc6
-rw-r--r--chrome/common/message_router.h2
-rw-r--r--chrome/common/render_messages_internal.h46
-rw-r--r--chrome/common/resource_dispatcher.cc5
-rw-r--r--chrome/renderer/print_web_view_helper_mac.mm6
-rw-r--r--chrome/renderer/print_web_view_helper_win.cc6
-rw-r--r--chrome/renderer/render_thread.cc102
-rw-r--r--chrome/renderer/render_thread.h41
-rw-r--r--chrome/renderer/render_view.cc36
-rw-r--r--chrome/renderer/render_view.h10
-rw-r--r--chrome/renderer/render_widget.h4
-rw-r--r--chrome/renderer/renderer_webkitclient_impl.cc28
-rw-r--r--chrome/renderer/renderer_webstoragearea_impl.cc22
-rw-r--r--webkit/glue/webkitclient_impl.cc21
-rw-r--r--webkit/glue/webkitclient_impl.h12
17 files changed, 262 insertions, 93 deletions
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc
index e973554..5d61738 100644
--- a/chrome/common/child_thread.cc
+++ b/chrome/common/child_thread.cc
@@ -95,6 +95,12 @@ void ChildThread::RemoveRoute(int32 routing_id) {
router_.RemoveRoute(routing_id);
}
+IPC::Channel::Listener* ChildThread::ResolveRoute(int32 routing_id) {
+ DCHECK(MessageLoop::current() == message_loop());
+
+ return router_.ResolveRoute(routing_id);
+}
+
webkit_glue::ResourceLoaderBridge* ChildThread::CreateBridge(
const webkit_glue::ResourceLoaderBridge::RequestInfo& request_info,
int host_renderer_id,
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index c731b45..2b55417 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -32,6 +32,8 @@ class ChildThread : public IPC::Channel::Listener,
void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
void RemoveRoute(int32 routing_id);
+ IPC::Channel::Listener* ResolveRoute(int32 routing_id);
+
// Creates a ResourceLoaderBridge.
// Tests can override this method if they want a custom loading behavior.
virtual webkit_glue::ResourceLoaderBridge* CreateBridge(
diff --git a/chrome/common/message_router.cc b/chrome/common/message_router.cc
index 4b0703e..b73f2d0 100644
--- a/chrome/common/message_router.cc
+++ b/chrome/common/message_router.cc
@@ -33,10 +33,14 @@ void MessageRouter::OnMessageReceived(const IPC::Message& msg) {
}
bool MessageRouter::RouteMessage(const IPC::Message& msg) {
- IPC::Channel::Listener* listener = routes_.Lookup(msg.routing_id());
+ IPC::Channel::Listener* listener = ResolveRoute(msg.routing_id());
if (!listener)
return false;
listener->OnMessageReceived(msg);
return true;
}
+
+IPC::Channel::Listener* MessageRouter::ResolveRoute(int32 routing_id) {
+ return routes_.Lookup(routing_id);
+}
diff --git a/chrome/common/message_router.h b/chrome/common/message_router.h
index 45fc03a..35d2a5d 100644
--- a/chrome/common/message_router.h
+++ b/chrome/common/message_router.h
@@ -50,6 +50,8 @@ class MessageRouter : public IPC::Channel::Listener,
void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
void RemoveRoute(int32 routing_id);
+ IPC::Channel::Listener* ResolveRoute(int32 routing_id);
+
private:
// A list of all listeners with assigned routing IDs.
IDMap<IPC::Channel::Listener> routes_;
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h
index eeba87e..208a280 100644
--- a/chrome/common/render_messages_internal.h
+++ b/chrome/common/render_messages_internal.h
@@ -1112,18 +1112,20 @@ IPC_BEGIN_MESSAGES(ViewHost)
GURL /* first_party_for_cookies */,
std::string /* cookie */)
- // Used to get cookies for the given URL
- IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_GetCookies,
- GURL /* url */,
- GURL /* first_party_for_cookies */,
- std::string /* cookies */)
+ // Used to get cookies for the given URL. This may be blocked by a user
+ // prompt to validate a previous SetCookie message.
+ IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_GetCookies,
+ GURL /* url */,
+ GURL /* first_party_for_cookies */,
+ std::string /* cookies */)
- // Used to get raw cookie information for the given URL
- IPC_SYNC_MESSAGE_CONTROL2_1(ViewHostMsg_GetRawCookies,
- GURL /* url */,
- GURL /* first_party_for_cookies */,
- std::vector<webkit_glue::WebCookie>
- /* raw_cookies */)
+ // Used to get raw cookie information for the given URL. This may be blocked
+ // by a user prompt to validate a previous SetCookie message.
+ IPC_SYNC_MESSAGE_ROUTED2_1(ViewHostMsg_GetRawCookies,
+ GURL /* url */,
+ GURL /* first_party_for_cookies */,
+ std::vector<webkit_glue::WebCookie>
+ /* raw_cookies */)
// Used to delete cookie for the given URL and name
IPC_SYNC_MESSAGE_CONTROL2_0(ViewHostMsg_DeleteCookie,
@@ -1458,10 +1460,10 @@ IPC_BEGIN_MESSAGES(ViewHost)
// by javascript. This step is about showing UI to the user to select the
// final print settings. The output parameter is the same as
// ViewMsg_PrintPages which is executed implicitly.
- IPC_SYNC_MESSAGE_CONTROL1_1(ViewHostMsg_ScriptedPrint,
- ViewHostMsg_ScriptedPrint_Params,
- ViewMsg_PrintPages_Params /* settings choosen by
- the user*/)
+ IPC_SYNC_MESSAGE_ROUTED1_1(ViewHostMsg_ScriptedPrint,
+ ViewHostMsg_ScriptedPrint_Params,
+ ViewMsg_PrintPages_Params
+ /* settings choosen by the user*/)
#endif // defined(OS_WIN) || defined(OS_MACOSX)
// WebKit and JavaScript error messages to log to the console
@@ -1981,13 +1983,13 @@ IPC_BEGIN_MESSAGES(ViewHost)
NullableString16 /* value */)
// Set a value that's associated with a key in a storage area.
- IPC_SYNC_MESSAGE_CONTROL4_2(ViewHostMsg_DOMStorageSetItem,
- int64 /* storage_area_id */,
- string16 /* key */,
- string16 /* value */,
- GURL /* url */,
- WebKit::WebStorageArea::Result /* result */,
- NullableString16 /* old_value */)
+ IPC_SYNC_MESSAGE_ROUTED4_2(ViewHostMsg_DOMStorageSetItem,
+ int64 /* storage_area_id */,
+ string16 /* key */,
+ string16 /* value */,
+ GURL /* url */,
+ WebKit::WebStorageArea::Result /* result */,
+ NullableString16 /* old_value */)
// Remove the value associated with a key in a storage area.
IPC_SYNC_MESSAGE_CONTROL3_1(ViewHostMsg_DOMStorageRemoveItem,
diff --git a/chrome/common/resource_dispatcher.cc b/chrome/common/resource_dispatcher.cc
index 7cbb2a8..de1c239 100644
--- a/chrome/common/resource_dispatcher.cc
+++ b/chrome/common/resource_dispatcher.cc
@@ -223,8 +223,9 @@ void IPCResourceLoaderBridge::SyncLoad(SyncLoadResponse* response) {
request_id_ = MakeRequestID();
SyncLoadResult result;
- IPC::Message* msg = new ViewHostMsg_SyncLoad(routing_id_, request_id_,
- request_, &result);
+ IPC::SyncMessage* msg = new ViewHostMsg_SyncLoad(routing_id_, request_id_,
+ request_, &result);
+ msg->EnableMessagePumping();
if (!dispatcher_->message_sender()->Send(msg)) {
response->status.set_status(URLRequestStatus::FAILED);
return;
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 6e2cc2d..96113fb 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -102,8 +102,10 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
params.has_selection = frame->hasSelection();
params.expected_pages_count = expected_pages_count;
- msg = new ViewHostMsg_ScriptedPrint(params, &print_settings);
- if (render_view_->SendAndRunNestedMessageLoop(msg)) {
+ msg = new ViewHostMsg_ScriptedPrint(routing_id(), params,
+ &print_settings);
+ msg->EnableMessagePumping();
+ if (Send(msg)) {
msg = NULL;
// If the settings are invalid, early quit.
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 6ba70a3..b75aa10 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -102,8 +102,10 @@ void PrintWebViewHelper::Print(WebFrame* frame, bool script_initiated) {
params.has_selection = false;
params.expected_pages_count = expected_pages_count;
- msg = new ViewHostMsg_ScriptedPrint(params, &print_settings);
- if (render_view_->SendAndRunNestedMessageLoop(msg)) {
+ msg = new ViewHostMsg_ScriptedPrint(routing_id(), params,
+ &print_settings);
+ msg->EnableMessagePumping();
+ if (Send(msg)) {
msg = NULL;
// If the settings are invalid, early quit.
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 7914507..26f4508 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -29,6 +29,7 @@
#include "chrome/common/child_process_logging.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/db_message_filter.h"
+#include "chrome/common/plugin_messages.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/renderer_preferences.h"
#include "chrome/common/url_constants.h"
@@ -49,6 +50,7 @@
#include "chrome/renderer/external_extension.h"
#include "chrome/renderer/loadtimes_extension_bindings.h"
#include "chrome/renderer/net/render_dns_master.h"
+#include "chrome/renderer/plugin_channel_host.h"
#include "chrome/renderer/render_process.h"
#include "chrome/renderer/render_view.h"
#include "chrome/renderer/render_view_visitor.h"
@@ -206,6 +208,9 @@ void RenderThread::Init() {
std::string type_str = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
switches::kProcessType);
is_extension_process_ = type_str == switches::kExtensionProcess;
+ do_not_suspend_webkit_shared_timer_ = false;
+ do_not_notify_webkit_of_modal_loop_ = false;
+ did_notify_webkit_of_modal_loop_ = false;
plugin_refresh_allowed_ = true;
cache_stats_task_pending_ = false;
widget_count_ = 0;
@@ -260,6 +265,90 @@ RenderThread* RenderThread::current() {
return lazy_tls.Pointer()->Get();
}
+int32 RenderThread::RoutingIDForCurrentContext() {
+ int32 routing_id = MSG_ROUTING_CONTROL;
+ if (v8::Context::InContext()) {
+ RenderView* view =
+ RenderView::FromWebView(WebFrame::frameForCurrentContext()->view());
+ DCHECK(view);
+ routing_id = view->routing_id();
+ } else {
+ DLOG(WARNING) << "Not called within a script context!";
+ }
+ return routing_id;
+}
+
+bool RenderThread::Send(IPC::Message* msg) {
+ gfx::NativeViewId host_window = 0;
+ bool pumping_events = false;
+
+ // Inform related plugins when they also need to pump events.
+ if (msg->is_sync() && msg->is_caller_pumping_messages()) {
+ pumping_events = true;
+ RenderWidget* widget =
+ static_cast<RenderWidget*>(ResolveRoute(msg->routing_id()));
+ if (widget)
+ host_window = widget->host_window();
+ }
+
+ bool do_not_suspend_webkit_shared_timer = false;
+ std::swap(do_not_suspend_webkit_shared_timer,
+ do_not_suspend_webkit_shared_timer_);
+
+ bool do_not_notify_webkit_of_modal_loop = false;
+ std::swap(do_not_notify_webkit_of_modal_loop,
+ do_not_notify_webkit_of_modal_loop_);
+
+ if (pumping_events) {
+ if (!do_not_suspend_webkit_shared_timer)
+ webkit_client_->SuspendSharedTimer();
+
+ // WebKit does not like nested calls to willEnterModalLoop.
+ // TODO(darin): Fix WebKit to allow nesting.
+ if (!do_not_notify_webkit_of_modal_loop &&
+ !did_notify_webkit_of_modal_loop_) {
+ WebView::willEnterModalLoop();
+ did_notify_webkit_of_modal_loop_ = true;
+ }
+
+ if (host_window) {
+ PluginChannelHost::Broadcast(
+ new PluginMsg_SignalModalDialogEvent(host_window));
+ }
+ }
+
+ bool rv = ChildThread::Send(msg);
+
+ if (pumping_events) {
+ if (host_window) {
+ PluginChannelHost::Broadcast(
+ new PluginMsg_ResetModalDialogEvent(host_window));
+ }
+
+ if (!do_not_notify_webkit_of_modal_loop &&
+ did_notify_webkit_of_modal_loop_) {
+ WebView::didExitModalLoop();
+ did_notify_webkit_of_modal_loop_ = false;
+ }
+
+ if (!do_not_suspend_webkit_shared_timer)
+ webkit_client_->ResumeSharedTimer();
+ }
+
+ return rv;
+}
+
+void RenderThread::AddRoute(int32 routing_id,
+ IPC::Channel::Listener* listener) {
+ widget_count_++;
+ return ChildThread::AddRoute(routing_id, listener);
+}
+
+void RenderThread::RemoveRoute(int32 routing_id) {
+ widget_count_--;
+ return ChildThread::RemoveRoute(routing_id);
+}
+
void RenderThread::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
channel()->AddFilter(filter);
}
@@ -283,6 +372,19 @@ void RenderThread::WidgetRestored() {
idle_timer_.Stop();
}
+bool RenderThread::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
+ message->EnableMessagePumping();
+ return Send(message);
+}
+
+void RenderThread::DoNotSuspendWebKitSharedTimer() {
+ do_not_suspend_webkit_shared_timer_ = true;
+}
+
+void RenderThread::DoNotNotifyWebKitOfModalLoop() {
+ do_not_notify_webkit_of_modal_loop_ = true;
+}
+
void RenderThread::Resolve(const char* name, size_t length) {
return dns_master_->Resolve(name, length);
}
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 0336ba8..416b71b 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -92,26 +92,35 @@ class RenderThread : public RenderThreadBase,
// be accessed when running on the render thread itself
static RenderThread* current();
- // Overridden from RenderThreadBase.
- virtual bool Send(IPC::Message* msg) {
- return ChildThread::Send(msg);
- }
-
- virtual void AddRoute(int32 routing_id, IPC::Channel::Listener* listener) {
- widget_count_++;
- return ChildThread::AddRoute(routing_id, listener);
- }
- virtual void RemoveRoute(int32 routing_id) {
- widget_count_--;
- return ChildThread::RemoveRoute(routing_id);
- }
+ // Returns the routing ID of the RenderWidget containing the current script
+ // execution context (corresponding to WebFrame::frameForCurrentContext).
+ static int32 RoutingIDForCurrentContext();
+ // Overridden from RenderThreadBase.
+ virtual bool Send(IPC::Message* msg);
+ virtual void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
+ virtual void RemoveRoute(int32 routing_id);
virtual void AddFilter(IPC::ChannelProxy::MessageFilter* filter);
virtual void RemoveFilter(IPC::ChannelProxy::MessageFilter* filter);
-
virtual void WidgetHidden();
virtual void WidgetRestored();
+ // Send a synchronous message and run a nested message loop, while waiting
+ // for a reply.
+ //
+ // NOTE: Only use this method if the handler for the message may need to show
+ // UI before replying.
+ //
+ bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
+
+ // These methods modify how the next message is sent. Normally, when sending
+ // a synchronous message that runs a nested message loop, we need to suspend
+ // callbacks into WebKit. This involves disabling timers and deferring
+ // resource loads. However, there are exceptions when we need to customize
+ // the behavior.
+ void DoNotSuspendWebKitSharedTimer();
+ void DoNotNotifyWebKitOfModalLoop();
+
VisitedLinkSlave* visited_link_slave() const {
return visited_link_slave_.get();
}
@@ -255,6 +264,10 @@ class RenderThread : public RenderThreadBase,
// True if this renderer is running extensions.
bool is_extension_process_;
+ bool do_not_suspend_webkit_shared_timer_;
+ bool do_not_notify_webkit_of_modal_loop_;
+ bool did_notify_webkit_of_modal_loop_;
+
// Timer that periodically calls IdleHandler.
base::RepeatingTimer<RenderThread> idle_timer_;
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 7a5fad2..aab3445 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -32,7 +32,6 @@
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/page_zoom.h"
-#include "chrome/common/plugin_messages.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/renderer_preferences.h"
#include "chrome/common/thumbnail_score.h"
@@ -1407,6 +1406,18 @@ bool RenderView::RunJavaScriptMessage(int type,
return success;
}
+bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
+ // Before WebKit asks us to show an alert (etc.), it takes care of doing the
+ // equivalent of WebView::willEnterModalLoop. In the case of showModalDialog
+ // it is particularly important that we do not call willEnterModalLoop as
+ // that would defer resource loads for the dialog itself.
+ if (RenderThread::current()) // Will be NULL during unit tests.
+ RenderThread::current()->DoNotNotifyWebKitOfModalLoop();
+
+ message->EnableMessagePumping(); // Runs a nested message loop.
+ return Send(message);
+}
+
void RenderView::AddGURLSearchProvider(const GURL& osd_url, bool autodetected) {
if (!osd_url.is_empty())
Send(new ViewHostMsg_PageHasOSDD(routing_id_, page_id_, osd_url,
@@ -1989,6 +2000,16 @@ void RenderView::closeWidgetSoon() {
void RenderView::runModal() {
DCHECK(did_show_) << "should already have shown the view";
+ // We must keep WebKit's shared timer running in this case in order to allow
+ // showModalDialog to function properly.
+ //
+ // TODO(darin): WebKit should really be smarter about suppressing events and
+ // timers so that we do not need to manage the shared timer in such a heavy
+ // handed manner.
+ //
+ if (RenderThread::current()) // Will be NULL during unit tests.
+ RenderThread::current()->DoNotSuspendWebKitSharedTimer();
+
SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_));
}
@@ -4451,19 +4472,6 @@ void RenderView::EnsureDocumentTag() {
#endif
}
-bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
- PluginChannelHost::Broadcast(
- new PluginMsg_SignalModalDialogEvent(host_window_));
-
- message->EnableMessagePumping(); // Runs a nested message loop.
- bool rv = Send(message);
-
- PluginChannelHost::Broadcast(
- new PluginMsg_ResetModalDialogEvent(host_window_));
-
- return rv;
-}
-
#if defined(OS_MACOSX)
gfx::PluginWindowHandle RenderView::AllocateFakePluginWindowHandle() {
gfx::PluginWindowHandle window = NULL;
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index f9ab206..60deea6 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -157,10 +157,6 @@ class RenderView : public RenderWidget,
return static_cast<WebKit::WebView*>(webwidget());
}
- gfx::NativeViewId host_window() const {
- return host_window_;
- }
-
int browser_window_id() const {
return browser_window_id_;
}
@@ -450,9 +446,6 @@ class RenderView : public RenderWidget,
return webkit_preferences_;
}
- // Sends a message and runs a nested message loop.
- bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
-
// Called when the "idle" user script state has been reached. See
// UserScript::DOCUMENT_IDLE.
void OnUserScriptIdleTriggered(WebKit::WebFrame* frame);
@@ -573,6 +566,9 @@ class RenderView : public RenderWidget,
const GURL& frame_url,
std::wstring* result);
+ // Sends a message and runs a nested message loop.
+ bool SendAndRunNestedMessageLoop(IPC::SyncMessage* message);
+
// Adds search provider from the given OpenSearch description URL as a
// keyword search.
void AddGURLSearchProvider(const GURL& osd_url, bool autodetected);
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 27086a4..d8aca5b 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -66,6 +66,10 @@ class RenderWidget : public IPC::Channel::Listener,
return webwidget_;
}
+ gfx::NativeViewId host_window() const {
+ return host_window_;
+ }
+
// IPC::Channel::Listener
virtual void OnMessageReceived(const IPC::Message& msg);
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index 504d8f3..a475616 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -116,13 +116,7 @@ void RendererWebKitClientImpl::setCookies(const WebURL& url,
const WebString& value) {
// TODO(darin): Modify WebKit to pass the WebFrame. This code may be reached
// when there is no active script context.
- int routing_id = MSG_ROUTING_CONTROL;
- if (v8::Context::InContext()) {
- RenderView* view =
- RenderView::FromWebView(WebFrame::frameForCurrentContext()->view());
- DCHECK(view);
- routing_id = view->routing_id();
- }
+ int32 routing_id = RenderThread::RoutingIDForCurrentContext();
std::string value_utf8;
UTF16ToUTF8(value.data(), value.length(), &value_utf8);
@@ -133,9 +127,15 @@ void RendererWebKitClientImpl::setCookies(const WebURL& url,
WebString RendererWebKitClientImpl::cookies(
const WebURL& url, const WebURL& first_party_for_cookies) {
+ // TODO(darin): Modify WebKit to pass the WebFrame. This code may be reached
+ // when there is no active script context.
+ int32 routing_id = RenderThread::RoutingIDForCurrentContext();
+
std::string value_utf8;
- RenderThread::current()->Send(
- new ViewHostMsg_GetCookies(url, first_party_for_cookies, &value_utf8));
+ RenderThread::current()->SendAndRunNestedMessageLoop(
+ new ViewHostMsg_GetCookies(routing_id, url, first_party_for_cookies,
+ &value_utf8));
+
return WebString::fromUTF8(value_utf8);
}
@@ -143,9 +143,15 @@ bool RendererWebKitClientImpl::rawCookies(
const WebURL& url,
const WebURL& first_party_for_cookies,
WebVector<WebKit::WebCookie>* raw_cookies) {
+ // TODO(darin): Modify WebKit to pass the WebFrame. This code may be reached
+ // when there is no active script context.
+ int32 routing_id = RenderThread::RoutingIDForCurrentContext();
+
std::vector<webkit_glue::WebCookie> cookies;
- RenderThread::current()->Send(
- new ViewHostMsg_GetRawCookies(url, first_party_for_cookies, &cookies));
+ RenderThread::current()->SendAndRunNestedMessageLoop(
+ new ViewHostMsg_GetRawCookies(routing_id, url, first_party_for_cookies,
+ &cookies));
+
WebVector<WebKit::WebCookie> result(cookies.size());
int i = 0;
diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/chrome/renderer/renderer_webstoragearea_impl.cc
index 20ce740..e1a9fb9 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.cc
+++ b/chrome/renderer/renderer_webstoragearea_impl.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#include "chrome/renderer/renderer_webstoragearea_impl.h"
@@ -9,10 +9,12 @@
#include "chrome/renderer/render_view.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
#include "third_party/WebKit/WebKit/chromium/public/WebURL.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebView.h"
using WebKit::WebFrame;
using WebKit::WebString;
using WebKit::WebURL;
+using WebKit::WebView;
RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
int64 namespace_id, const WebString& origin) {
@@ -48,18 +50,18 @@ WebString RendererWebStorageAreaImpl::getItem(const WebString& key) {
void RendererWebStorageAreaImpl::setItem(
const WebString& key, const WebString& value, const WebURL& url,
WebStorageArea::Result& result, WebString& old_value_webkit) {
+ int32 routing_id = RenderThread::RoutingIDForCurrentContext();
+ CHECK(routing_id != MSG_ROUTING_CONTROL);
+
NullableString16 old_value;
- RenderThread::current()->Send(
- new ViewHostMsg_DOMStorageSetItem(storage_area_id_, key, value, url,
- &result, &old_value));
+ RenderThread::current()->SendAndRunNestedMessageLoop(
+ new ViewHostMsg_DOMStorageSetItem(routing_id, storage_area_id_, key,
+ value, url, &result, &old_value));
old_value_webkit = old_value;
if (result == WebStorageArea::ResultBlockedByPolicy) {
- RenderView* view =
- RenderView::FromWebView(WebFrame::frameForCurrentContext()->view());
- DCHECK(view);
RenderThread::current()->Send(new ViewHostMsg_ContentBlocked(
- view->routing_id(), CONTENT_SETTINGS_TYPE_COOKIES));
+ routing_id, CONTENT_SETTINGS_TYPE_COOKIES));
}
}
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index e33384d..49f3d91 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#include "webkit/glue/webkitclient_impl.h"
@@ -100,7 +100,8 @@ static int ToMessageID(WebLocalizedString::Name name) {
WebKitClientImpl::WebKitClientImpl()
: main_loop_(MessageLoop::current()),
- shared_timer_func_(NULL) {
+ shared_timer_func_(NULL),
+ shared_timer_suspended_(0) {
}
WebApplicationCacheHost* WebKitClientImpl::createApplicationCacheHost(
@@ -256,6 +257,9 @@ void WebKitClientImpl::setSharedTimerFiredFunction(void (*func)()) {
}
void WebKitClientImpl::setSharedTimerFireTime(double fire_time) {
+ if (shared_timer_suspended_)
+ return;
+
// By converting between double and int64 representation, we run the risk
// of losing precision due to rounding errors. Performing computations in
// microseconds reduces this risk somewhat. But there still is the potential
@@ -394,4 +398,13 @@ WebKit::WebURL WebKitClientImpl::filePathToURL(const WebKit::WebString& path) {
return net::FilePathToFileURL(webkit_glue::WebStringToFilePath(path));
}
+void WebKitClientImpl::SuspendSharedTimer() {
+ ++shared_timer_suspended_;
+}
+
+void WebKitClientImpl::ResumeSharedTimer() {
+ if (--shared_timer_suspended_ == 0)
+ setSharedTimerFireTime(currentTime());
+}
+
} // namespace webkit_glue
diff --git a/webkit/glue/webkitclient_impl.h b/webkit/glue/webkitclient_impl.h
index 16b4c67..8d9cd52 100644
--- a/webkit/glue/webkitclient_impl.h
+++ b/webkit/glue/webkitclient_impl.h
@@ -1,6 +1,6 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
#ifndef WEBKIT_CLIENT_IMPL_H_
#define WEBKIT_CLIENT_IMPL_H_
@@ -75,15 +75,19 @@ class WebKitClientImpl : public WebKit::WebKitClient {
virtual void stopSharedTimer();
virtual void callOnMainThread(void (*func)());
+ void SuspendSharedTimer();
+ void ResumeSharedTimer();
+
private:
void DoTimeout() {
- if (shared_timer_func_)
+ if (shared_timer_func_ && !shared_timer_suspended_)
shared_timer_func_();
}
MessageLoop* main_loop_;
base::OneShotTimer<WebKitClientImpl> shared_timer_;
void (*shared_timer_func_)();
+ int shared_timer_suspended_; // counter
#if defined(OS_WIN)
WebThemeEngineImpl theme_engine_;
generated by cgit v1.1 at 2025-01-19 11:17:18 +0000