Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(614)

Side by Side Diff: content/renderer/render_thread_impl.cc

Issue 8581004: Ensure that WebKit is initialized before making calls to it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/render_thread_impl.h" 5 #include "content/renderer/render_thread_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 } 624 }
625 625
626 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const GURL& url, 626 void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const GURL& url,
627 double zoom_level) { 627 double zoom_level) {
628 RenderViewZoomer zoomer(url, zoom_level); 628 RenderViewZoomer zoomer(url, zoom_level);
629 content::RenderView::ForEach(&zoomer); 629 content::RenderView::ForEach(&zoomer);
630 } 630 }
631 631
632 void RenderThreadImpl::OnDOMStorageEvent( 632 void RenderThreadImpl::OnDOMStorageEvent(
633 const DOMStorageMsg_Event_Params& params) { 633 const DOMStorageMsg_Event_Params& params) {
634 if (!dom_storage_event_dispatcher_.get()) 634 if (!dom_storage_event_dispatcher_.get()) {
635 EnsureWebKitInitialized();
635 dom_storage_event_dispatcher_.reset(WebStorageEventDispatcher::create()); 636 dom_storage_event_dispatcher_.reset(WebStorageEventDispatcher::create());
637 }
636 dom_storage_event_dispatcher_->dispatchStorageEvent(params.key, 638 dom_storage_event_dispatcher_->dispatchStorageEvent(params.key,
637 params.old_value, params.new_value, params.origin, params.url, 639 params.old_value, params.new_value, params.origin, params.url,
638 params.storage_type == DOM_STORAGE_LOCAL); 640 params.storage_type == DOM_STORAGE_LOCAL);
639 } 641 }
640 642
641 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { 643 bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
642 ObserverListBase<RenderProcessObserver>::Iterator it(observers_); 644 ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
643 RenderProcessObserver* observer; 645 RenderProcessObserver* observer;
644 while ((observer = it.GetNext()) != NULL) { 646 while ((observer = it.GetNext()) != NULL) {
645 if (observer->OnControlMessageReceived(msg)) 647 if (observer->OnControlMessageReceived(msg))
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 787
786 scoped_refptr<base::MessageLoopProxy> 788 scoped_refptr<base::MessageLoopProxy>
787 RenderThreadImpl::GetFileThreadMessageLoopProxy() { 789 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
788 DCHECK(message_loop() == MessageLoop::current()); 790 DCHECK(message_loop() == MessageLoop::current());
789 if (!file_thread_.get()) { 791 if (!file_thread_.get()) {
790 file_thread_.reset(new base::Thread("Renderer::FILE")); 792 file_thread_.reset(new base::Thread("Renderer::FILE"));
791 file_thread_->Start(); 793 file_thread_->Start();
792 } 794 }
793 return file_thread_->message_loop_proxy(); 795 return file_thread_->message_loop_proxy();
794 } 796 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698