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

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

Issue 8834013: Fix a race condition in the Java Bridge when adding objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits Created 9 years 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
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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 4770 matching lines...) Expand 10 before | Expand all | Expand 10 after
4781 } 4781 }
4782 4782
4783 void RenderViewImpl::OnMouseLockLost() { 4783 void RenderViewImpl::OnMouseLockLost() {
4784 pepper_delegate_.OnMouseLockLost(); 4784 pepper_delegate_.OnMouseLockLost();
4785 } 4785 }
4786 4786
4787 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 4787 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
4788 return !!RenderThreadImpl::current()->compositor_thread(); 4788 return !!RenderThreadImpl::current()->compositor_thread();
4789 } 4789 }
4790 4790
4791 void RenderViewImpl::OnJavaBridgeInit( 4791 void RenderViewImpl::OnJavaBridgeInit() {
4792 const IPC::ChannelHandle& channel_handle) {
4793 DCHECK(!java_bridge_dispatcher_.get()); 4792 DCHECK(!java_bridge_dispatcher_.get());
4794 #if defined(ENABLE_JAVA_BRIDGE) 4793 #if defined(ENABLE_JAVA_BRIDGE)
4795 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this, channel_handle)); 4794 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
4796 #endif 4795 #endif
4797 } 4796 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698