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

Unified Diff: chrome/renderer/webplugin_delegate_proxy.cc

Issue 267076: Turn NULL used as int to 0. (Closed)
Patch Set: Created 11 years, 2 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 | « chrome/renderer/render_widget.cc ('k') | chrome/test/render_view_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/webplugin_delegate_proxy.cc
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index d67a68ec877216a5337b9d5c6009bbfbd06be428..b15de390e7e48ed67565e64dcf98f13bc38b522d 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -60,7 +60,7 @@ class ResourceClientProxy : public webkit_glue::WebPluginResourceClient {
public:
ResourceClientProxy(PluginChannelHost* channel, int instance_id)
: channel_(channel), instance_id_(instance_id), resource_id_(0),
- notify_needed_(false), notify_data_(NULL),
+ notify_needed_(false), notify_data_(0),
multibyte_response_expected_(false) {
}
@@ -161,7 +161,7 @@ WebPluginDelegateProxy::WebPluginDelegateProxy(
: render_view_(render_view),
plugin_(NULL),
windowless_(false),
- window_(NULL),
+ window_(gfx::kNullPluginWindow),
mime_type_(mime_type),
instance_id_(MSG_ROUTING_NONE),
npobject_(NULL),
@@ -656,8 +656,8 @@ bool WebPluginDelegateProxy::BackgroundChanged(
#else
const unsigned char* page_bytes = cairo_image_surface_get_data(page_surface);
int page_stride = cairo_image_surface_get_stride(page_surface);
- int page_start_x = page_x_double;
- int page_start_y = page_y_double;
+ int page_start_x = static_cast<int>(page_x_double);
+ int page_start_y = static_cast<int>(page_y_double);
skia::PlatformDevice& device =
background_store_canvas_->getTopPlatformDevice();
@@ -786,7 +786,7 @@ void WebPluginDelegateProxy::OnSetWindow(gfx::PluginWindowHandle window) {
void WebPluginDelegateProxy::WillDestroyWindow() {
DCHECK(window_);
plugin_->WillDestroyWindow(window_);
- window_ = NULL;
+ window_ = gfx::kNullPluginWindow;
}
#if defined(OS_WIN)
@@ -936,7 +936,7 @@ void WebPluginDelegateProxy::OnGetDragData(const NPVariant_Param& object,
for (size_t i = 0; i < arraysize(results); ++i) {
values->push_back(NPVariant_Param());
CreateNPVariantParam(
- results[i], NULL, &values->back(), false, NULL, page_url_);
+ results[i], NULL, &values->back(), false, 0, page_url_);
}
*success = true;
« no previous file with comments | « chrome/renderer/render_widget.cc ('k') | chrome/test/render_view_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698