Upgrade Seperator in New Autofill UI

chrome/browser/ui/gtk/autofill/autofill_popup_view_gtk.cc

 // Copyright (c) 2012 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 "autofill_popup_view_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_windowing.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 
+using WebKit::WebAutofillClient;
+
 namespace {
 const GdkColor kBorderColor = GDK_COLOR_RGB(0xc7, 0xca, 0xce);
 const GdkColor kHoveredBackgroundColor = GDK_COLOR_RGB(0x0CD, 0xCD, 0xCD);
 const GdkColor kTextColor = GDK_COLOR_RGB(0x00, 0x00, 0x00);
 
 // The vertical height of each row in pixels.
 const int kRowHeight = 24;
 
 // The amount of minimum padding between the Autofill value and label in pixels.
 const int kMiddlePadding = 10;
 
 // The amount of padding between the label and icon or edge and icon in pixels.
 const int kIconPadding = 5;
 
 // We have a 1 pixel border around the entire results popup.
 const int kBorderThickness = 1;
 
 // Width of the icons in pixels.
 const int kIconWidth = 25;
 
 // Height of the icons in pixels.
 const int kIconHeight = 16;
 
 gfx::Rect GetWindowRect(GdkWindow* window) {
   return gfx::Rect(gdk_window_get_width(window),
                    gdk_window_get_height(window));
 }
 
 // Returns the rectangle containing the item at position |index| in the popup.
-gfx::Rect GetRectForRow(size_t index, int width) {
-  return gfx::Rect(0, (index * kRowHeight), width, kRowHeight);
+gfx::Rect GetRectForRow(size_t row, int width) {
+  return gfx::Rect(0, (row * kRowHeight), width, kRowHeight);
 }
 
 }  // namespace
 
 AutofillPopupViewGtk::AutofillPopupViewGtk(
     content::WebContents* web_contents,
     GtkThemeService* theme_service,
     AutofillExternalDelegate* external_delegate,
     GtkWidget* parent)
     : AutofillPopupView(web_contents, external_delegate),
@@ skipping 52 matching lines @@
 void AutofillPopupViewGtk::InvalidateRow(size_t row) {
   GdkRectangle row_rect = GetRectForRow(row, bounds_.width()).ToGdkRectangle();
   GdkWindow* gdk_window = gtk_widget_get_window(window_);
   gdk_window_invalidate_rect(gdk_window, &row_rect, FALSE);
 }
 
 void AutofillPopupViewGtk::ResizePopup() {
   gtk_widget_set_size_request(
       window_,
       GetPopupRequiredWidth(),
-      kRowHeight * autofill_values().size());
+      kRowHeight * row_count());
 }
 
 gboolean AutofillPopupViewGtk::HandleButtonRelease(GtkWidget* widget,
                                                    GdkEventButton* event) {
   // We only care about the left click.
   if (event->button != 1)
     return FALSE;
 
   DCHECK_EQ(selected_line(), LineFromY(event->y));
 
@@ skipping 20 matching lines @@
   cairo_rectangle(cr, 0, 0, window_rect.width(), window_rect.height());
   cairo_stroke(cr);
 
   SetupLayout(window_rect, kTextColor);
 
   int actual_content_width, actual_content_height;
   pango_layout_get_size(layout_, &actual_content_width, &actual_content_height);
   actual_content_width /= PANGO_SCALE;
   actual_content_height /= PANGO_SCALE;
 
+  int current_row = 0;
   for (size_t i = 0; i < autofill_values().size(); ++i) {
-    gfx::Rect line_rect = GetRectForRow(i, window_rect.width());
+    gfx::Rect line_rect = GetRectForRow(current_row, window_rect.width());
     // Only repaint and layout damaged lines.
-    if (!line_rect.Intersects(damage_rect))
+    if (!line_rect.Intersects(damage_rect)) {
+      if (autofill_unique_ids()[i] != WebAutofillClient::MenuItemIDSeparator)
+        ++current_row;
       continue;
+    }
 
-    if (IsSeparatorIndex(i)) {
-      int line_y = i * kRowHeight;
+    if (autofill_unique_ids()[i] == WebAutofillClient::MenuItemIDSeparator) {
+      int line_y = current_row * kRowHeight;
 
       cairo_save(cr);
       cairo_move_to(cr, 0, line_y);
       cairo_line_to(cr, window_rect.width(), line_y);
       cairo_stroke(cr);
       cairo_restore(cr);
+
+      // All the separator index should do is draw the line, move to the next
+      // element now.
+      continue;
     }
 
-    if (selected_line() == static_cast<int>(i)) {
+    if (selected_line() == static_cast<int>(current_row)) {
       gdk_cairo_set_source_color(cr, &kHoveredBackgroundColor);
       cairo_rectangle(cr, line_rect.x(), line_rect.y(),
                       line_rect.width(), line_rect.height());
       cairo_fill(cr);
     }
 
     // Center the text within the line.
     int content_y = std::max(
         line_rect.y(),
         line_rect.y() + ((kRowHeight - actual_content_height) / 2));
@@ skipping 28 matching lines @@
 
       cairo_save(cr);
       gtk_util::DrawFullImage(cr,
                               window_,
                               theme_service_->GetImageNamed(icon),
                               window_rect.width() -
                                 (kIconPadding + kIconWidth),
                               icon_y);
       cairo_restore(cr);
     }
+
+    // Increase the current row.
+    ++current_row;
   }
 
   cairo_destroy(cr);
 
   return TRUE;
 }
 
 gboolean AutofillPopupViewGtk::HandleMotion(GtkWidget* widget,
                                             GdkEventMotion* event) {
   int line = LineFromY(event->y);
@@ skipping 11 matching lines @@
     case GDK_Up:
       SelectPreviousLine();
       return true;
     case GDK_Down:
       SelectNextLine();
       return true;
     case GDK_Page_Up:
       SetSelectedLine(0);
       return true;
     case GDK_Page_Down:
-      SetSelectedLine(autofill_values().size() - 1);
+      SetSelectedLine(row_count() - 1);
       return true;
     case GDK_Escape:
       Hide();
       return true;
     case GDK_Delete:
     case GDK_KP_Delete:
       return (modifier == GDK_SHIFT_MASK) && RemoveSelectedLine();
     case GDK_Return:
     case GDK_KP_Enter:
       return AcceptSelectedLine();
@@ skipping 22 matching lines @@
 
 void AutofillPopupViewGtk::SetBounds() {
   gint origin_x, origin_y;
   gdk_window_get_origin(gtk_widget_get_window(parent_), &origin_x, &origin_y);
 
   GdkScreen* screen = gtk_widget_get_screen(parent_);
   gint screen_height = gdk_screen_get_height(screen);
 
   int bottom_of_field = origin_y + element_bounds().y() +
       element_bounds().height();
-  int popup_size =  kRowHeight * autofill_values().size();
+  int popup_size =  kRowHeight * row_count();
 
   // Find the correct top position of the popup so that is doesn't go off
   // the screen.
   int top_of_popup = 0;
   if (screen_height < bottom_of_field + popup_size) {
     // The popup must appear above the field.
     top_of_popup = origin_y + element_bounds().y() - popup_size;
   } else {
     // The popup can appear below the field.
     top_of_popup = bottom_of_field;
@@ skipping 20 matching lines @@
 
     popup_width = std::max(popup_width, row_size);
   }
 
   return popup_width;
 }
 
 int AutofillPopupViewGtk::LineFromY(int y) {
   return y / kRowHeight;
 }