Fix for flickering of images on login screen....

chrome/browser/chromeos/login/user_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 133 matching lines @@
     const NotificationDetails& details) {
   if (type != NotificationType::LOGIN_USER_IMAGE_CHANGED ||
       !image_view_)
     return;
 
   UserManager::User* user = Details<UserManager::User>(details).ptr();
   if (user_.email() != user->email())
     return;
 
   user_.set_image(user->image());
-  SetImage(user_.image(), user_.image().width(), user_.image().height());
-  image_view_->SchedulePaint();
+  SetImage(user_.image());
 }
 
 void UserController::Login() {
   // Delegate will reenable as necessary.
   SetPasswordEnabled(false);
 
   delegate_->Login(this, password_field_->text());
 }
 
 WidgetGtk* UserController::CreateControlsWindow(int index, int* height) {
@@ skipping 31 matching lines @@
       &params);
   window->SetBounds(gfx::Rect(0, 0, kSize, pref.height()));
   window->Show();
   return window;
 }
 
 WidgetGtk* UserController::CreateImageWindow(int index) {
   image_view_ = new views::ImageView();
   image_view_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
-  if (!is_guest_) {
-    SetImage(user_.image(), user_.image().width(), user_.image().height());
-  } else {
+  if (!is_guest_)
+    SetImage(user_.image());
+  else
     SetImage(*ResourceBundle::GetSharedInstance().GetBitmapNamed(
-                 IDR_LOGIN_OTHER_USER),
-             kSize, kSize);
-  }
+                 IDR_LOGIN_OTHER_USER));
   WidgetGtk* window = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
-  window->Init(NULL, gfx::Rect());
+  window->Init(NULL, gfx::Rect(0, 0, kSize, kSize));
   window->SetContentsView(image_view_);
   std::vector<int> params;
   params.push_back(index);
   WmIpc::instance()->SetWindowType(
       window->GetNativeView(),
       WM_IPC_WINDOW_LOGIN_IMAGE,
       &params);
-  window->SetBounds(gfx::Rect(0, 0, kSize, kSize));
   window->Show();
   return window;
 }
 
 WidgetGtk* UserController::CreateBorderWindow(int index,
                                               int total_user_count,
                                               int controls_height) {
   WidgetGtk* window = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
   window->Init(NULL, gfx::Rect());
   window->GetRootView()->set_background(
@@ skipping 34 matching lines @@
   window->SetContentsView(label);
   int height = label->GetPreferredSize().height();
   std::vector<int> params;
   params.push_back(index);
   WmIpc::instance()->SetWindowType(window->GetNativeView(), type, &params);
   window->SetBounds(gfx::Rect(0, 0, width, height));
   window->Show();
   return window;
 }
 
-void UserController::SetImage(const SkBitmap& image,
-                              int desired_width,
-                              int desired_height) {
+void UserController::SetImage(const SkBitmap& image) {
+  int desired_size = std::min(image.width(), image.height());
+  // Desired size is not preserved if it's greater than 75% of kSize.
+  if (desired_size * 4 > 3 * kSize)
+    desired_size = kSize;
+  image_view_->SetImageSize(gfx::Size(desired_size, desired_size));
   image_view_->SetImage(image);
-  image_view_->SetImageSize(
-      gfx::Size(std::min(desired_width, kSize),
-                std::min(desired_height, kSize)));
 }
 
 gfx::Rect UserController::GetScreenBounds() const {
   gfx::Rect screen_bounds(password_field_->bounds());
   gfx::Point origin(screen_bounds.origin());
   views::View::ConvertPointToScreen(password_field_->GetParent(), &origin);
   screen_bounds.set_origin(origin);
   return screen_bounds;
 }
 
 }  // namespace chromeos