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

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

Issue 9845017: Fix a few warnings that -Wnull-conversion of a future clang will complain about. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 months 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4914 matching lines...) Expand 10 before | Expand all | Expand 10 after
4925 void RenderViewImpl::StartPluginIme() { 4925 void RenderViewImpl::StartPluginIme() {
4926 IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id()); 4926 IPC::Message* msg = new ViewHostMsg_StartPluginIme(routing_id());
4927 // This message can be sent during event-handling, and needs to be delivered 4927 // This message can be sent during event-handling, and needs to be delivered
4928 // within that context. 4928 // within that context.
4929 msg->set_unblock(true); 4929 msg->set_unblock(true);
4930 Send(msg); 4930 Send(msg);
4931 } 4931 }
4932 4932
4933 gfx::PluginWindowHandle RenderViewImpl::AllocateFakePluginWindowHandle( 4933 gfx::PluginWindowHandle RenderViewImpl::AllocateFakePluginWindowHandle(
4934 bool opaque, bool root) { 4934 bool opaque, bool root) {
4935 gfx::PluginWindowHandle window = NULL; 4935 gfx::PluginWindowHandle window = gfx::kNullPluginWindow;
4936 Send(new ViewHostMsg_AllocateFakePluginWindowHandle( 4936 Send(new ViewHostMsg_AllocateFakePluginWindowHandle(
4937 routing_id(), opaque, root, &window)); 4937 routing_id(), opaque, root, &window));
4938 if (window) { 4938 if (window) {
4939 fake_plugin_window_handles_.insert(window); 4939 fake_plugin_window_handles_.insert(window);
4940 } 4940 }
4941 return window; 4941 return window;
4942 } 4942 }
4943 4943
4944 void RenderViewImpl::DestroyFakePluginWindowHandle( 4944 void RenderViewImpl::DestroyFakePluginWindowHandle(
4945 gfx::PluginWindowHandle window) { 4945 gfx::PluginWindowHandle window) {
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
5201 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5201 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5202 return !!RenderThreadImpl::current()->compositor_thread(); 5202 return !!RenderThreadImpl::current()->compositor_thread();
5203 } 5203 }
5204 5204
5205 void RenderViewImpl::OnJavaBridgeInit() { 5205 void RenderViewImpl::OnJavaBridgeInit() {
5206 DCHECK(!java_bridge_dispatcher_.get()); 5206 DCHECK(!java_bridge_dispatcher_.get());
5207 #if defined(ENABLE_JAVA_BRIDGE) 5207 #if defined(ENABLE_JAVA_BRIDGE)
5208 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this)); 5208 java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
5209 #endif 5209 #endif
5210 } 5210 }
OLDNEW
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | content/renderer/webplugin_delegate_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698