[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 760 - Fixed password loss (Closes: #619903)

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 760
Revision Id: iuculano at debian.org-20110429071732-qhq8kbz6x9gbtflq
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message :  - Fixed password loss (Closes: #619903)
* Fixed FTBFS (converting to non-pointer type from NULL)


--------------------------------------------------------
  ** Added :
        - debian/patches/fix_null_conversion.patch

  ** Modified :
        - debian/changelog
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2011-04-28 12:35:01 +0000
+++ b/debian/changelog	2011-04-29 07:17:32 +0000
@@ -1,6 +1,7 @@
 chromium-browser (11.0.696.57~r82915-1) UNRELEASED; urgency=low
 
   * New Stable release:
+   - Fixed password loss (Closes: #619903)
    - [61502] High CVE-2011-1303: Stale pointer in floating object handling.
      Credit to Scott Hess of the Chromium development community and
      Martin Barbella.
@@ -50,8 +51,9 @@
      Credit to Sergey Glazunov.
   * Updated patches
   * Use libv8 system copy
+  * Fixed FTBFS (converting to non-pointer type from NULL)
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Thu, 28 Apr 2011 14:33:30 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Thu, 28 Apr 2011 19:33:20 +0200
 
 chromium-browser (10.0.648.205~r81283-1) unstable; urgency=low
 

=== added file 'debian/patches/fix_null_conversion.patch'
--- a/debian/patches/fix_null_conversion.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/fix_null_conversion.patch	2011-04-29 07:17:32 +0000
@@ -0,0 +1,60 @@
+--- a/src/chrome/browser/gpu_process_host_ui_shim.cc
++++ b/src/chrome/browser/gpu_process_host_ui_shim.cc
+@@ -102,7 +102,7 @@ RenderWidgetHostView* GpuProcessHostUISh
+ 
+ GpuProcessHostUIShim::GpuProcessHostUIShim()
+     : host_id_(++g_last_host_id),
+-      gpu_process_(NULL) {
++      gpu_process_(0) {
+   g_hosts_by_id.AddWithID(this, host_id_);
+   gpu_data_manager_ = GpuDataManager::GetInstance();
+   DCHECK(gpu_data_manager_);
+@@ -236,7 +236,7 @@ void GpuProcessHostUIShim::SendOutstandi
+     channel_requests_.pop();
+     EstablishChannelError(callback.release(),
+                           IPC::ChannelHandle(),
+-                          NULL,
++                          0,
+                           GPUInfo());
+   }
+ 
+@@ -266,7 +266,7 @@ void GpuProcessHostUIShim::EstablishGpuC
+   // If GPU features are already blacklisted, no need to establish the channel.
+   if (gpu_data_manager_->GetGpuFeatureFlags().flags() != 0) {
+     EstablishChannelError(
+-        wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
++        wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
+     return;
+   }
+ 
+@@ -274,7 +274,7 @@ void GpuProcessHostUIShim::EstablishGpuC
+     channel_requests_.push(wrapped_callback);
+   } else {
+     EstablishChannelError(
+-        wrapped_callback.release(), IPC::ChannelHandle(), NULL, GPUInfo());
++        wrapped_callback.release(), IPC::ChannelHandle(), 0, GPUInfo());
+   }
+ }
+ 
+@@ -419,7 +419,7 @@ void GpuProcessHostUIShim::OnChannelEsta
+     Send(new GpuMsg_CloseChannel(channel_handle));
+     EstablishChannelError(callback.release(),
+                           IPC::ChannelHandle(),
+-                          NULL,
++                          0,
+                           gpu_info);
+     AddCustomLogMessage(logging::LOG_WARNING, "WARNING",
+         "Hardware acceleration is unavailable.");
+--- a/src/chrome/gpu/gpu_channel.cc
++++ b/src/chrome/gpu/gpu_channel.cc
+@@ -26,8 +26,8 @@ GpuChannel::GpuChannel(GpuThread* gpu_th
+                        int renderer_id)
+     : gpu_thread_(gpu_thread),
+       renderer_id_(renderer_id),
+-      renderer_process_(NULL),
+-      renderer_pid_(NULL) {
++      renderer_process_(0),
++      renderer_pid_(0) {
+   DCHECK(gpu_thread);
+   DCHECK(renderer_id);
+   const CommandLine* command_line = CommandLine::ForCurrentProcess();

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2011-04-28 12:35:01 +0000
+++ b/debian/patches/series	2011-04-29 07:17:32 +0000
@@ -16,3 +16,4 @@
 fix-manpage.patch
 webkit-version.patch
 system_v8.patch
+fix_null_conversion.patch