diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 01:35:51 +0000 |
| commit | b2968292db57db2a46c17b0b785f7224a0a63878 (patch) | |
| tree | f2a0b0c36e90393aaea82d567c3554606b354356 /content/renderer/webplugin_delegate_proxy.cc | |
| parent | 6fdd4411046d735e9dba5a163d03262cc618a27f (diff) | |
| download | chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.zip chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.gz chromium_src-b2968292db57db2a46c17b0b785f7224a0a63878.tar.bz2 | |
Fix a few warnings that -Wnull-conversion of a future clang will complain about.
BUG=none
TEST=none
TBR=OWNERS
NOTRY=true
Review URL: http://codereview.chromium.org/9845017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129337 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/webplugin_delegate_proxy.cc')
| -rw-r--r-- | content/renderer/webplugin_delegate_proxy.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc index 1dd9bfb..1945670 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( |