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

Unified Diff: content/renderer/webplugin_delegate_proxy.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | crypto/cssm_init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webplugin_delegate_proxy.cc
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 1dd9bfb833913c15352542b081e94acd7904771e..1945670c4735e17a50f1fa6fdcc5336e5ded8efc 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -1317,7 +1317,7 @@ void WebPluginDelegateProxy::OnBindFakePluginWindowHandle(bool opaque) {
// the plug-in. Returns true if it successfully sets the window handle on the
// plug-in.
bool WebPluginDelegateProxy::BindFakePluginWindowHandle(bool opaque) {
- gfx::PluginWindowHandle fake_window = NULL;
+ gfx::PluginWindowHandle fake_window = gfx::kNullPluginWindow;
if (render_view_)
fake_window = render_view_->AllocateFakePluginWindowHandle(opaque, false);
// If we aren't running on 10.6, this allocation will fail.
@@ -1415,7 +1415,7 @@ void WebPluginDelegateProxy::OnAcceleratedSurfaceBuffersSwapped(
void WebPluginDelegateProxy::OnAcceleratedPluginEnabledRendering() {
uses_compositor_ = true;
- OnSetWindow(NULL);
+ OnSetWindow(gfx::kNullPluginWindow);
}
void WebPluginDelegateProxy::OnAcceleratedPluginAllocatedIOSurface(
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | crypto/cssm_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698