Always aligns text at vertically center (Textfield, Label).

chrome/browser/ui/views/omnibox/omnibox_result_view.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.
 
 // For WinDDK ATL compatibility, these ATL headers must come first.
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <atlbase.h>  // NOLINT
 #include <atlwin.h>  // NOLINT
 #endif
@@ skipping 453 matching lines @@
   // Draw the runs.
   for (Runs::iterator i(runs.begin()); i != runs.end(); ++i) {
     const bool reverse_visible_order = (i->is_rtl != base::i18n::IsRTL());
     if (reverse_visible_order)
       std::reverse(i->classifications.begin(), i->classifications.end());
     for (Classifications::const_iterator j(i->classifications.begin());
          j != i->classifications.end(); ++j) {
       const gfx::Size size = (*j)->GetStringSize();
       // Align the text runs to a common baseline.
       const gfx::Rect rect(
-          mirroring_context_->mirrored_left_coord(x, x + size.width()),
-          y + font_list_.GetBaseline() - (*j)->GetBaseline(),
-          size.width(), size.height());
+          mirroring_context_->mirrored_left_coord(x, x + size.width()), y,
+          size.width(), height());
       (*j)->SetDisplayRect(rect);
       (*j)->Draw(canvas);
       x += size.width();
     }
   }
 
   return x;
 }
 
 void OmniboxResultView::Elide(Runs* runs, int remaining_width) const {
@@ skipping 80 matching lines @@
 
 void OmniboxResultView::Layout() {
   const gfx::ImageSkia icon = GetIcon();
 
   icon_bounds_.SetRect(edge_item_padding_ +
       ((icon.width() == default_icon_size_) ?
           0 : LocationBarView::kIconInternalPadding),
       (height() - icon.height()) / 2, icon.width(), icon.height());
 
   int text_x = edge_item_padding_ + default_icon_size_ + item_padding_;
-  int text_height = GetTextHeight();
   int text_width;

[msw, 2013/10/23 01:18:00]

nit: please explicitly initialize this to 0.

[Yuki, 2013/10/24 14:32:54]

I think it's better not to initialize this to 0.

The following if-else-clauses initialize this variable.  If it's not initialized
and used, then compilers warn it.

In the case that we initialize this to 0 here, even if we forgot to assign a
value in the else-clause, compilers do not warn anything.  And then, the value 0
is used.

So I think it's better to leave it uninitialized in this case.

[Peter Kasting, 2013/10/24 20:12:05]

What about initializing it to (width() - text_x - edge_item_padding_) and
dropping the else clause?

[Yuki, 2013/10/25 15:21:09]

Done.

 
   if (match_.associated_keyword.get()) {
     const int kw_collapsed_size =
         keyword_icon_->width() + edge_item_padding_;
     const int max_kw_x = width() - kw_collapsed_size;
     const int kw_x =
         animation_->CurrentValueBetween(max_kw_x, edge_item_padding_);
     const int kw_text_x = kw_x + keyword_icon_->width() + item_padding_;
 
     text_width = kw_x - text_x - item_padding_;
-    keyword_text_bounds_.SetRect(kw_text_x, 0,
-        std::max(width() - kw_text_x - edge_item_padding_, 0), text_height);
-    keyword_icon_->SetPosition(gfx::Point(kw_x,
-        (height() - keyword_icon_->height()) / 2));
+    keyword_text_bounds_.SetRect(
+        kw_text_x, 0,
+        std::max(width() - kw_text_x - edge_item_padding_, 0), height());
+    keyword_icon_->SetPosition(
+        gfx::Point(kw_x, (height() - keyword_icon_->height()) / 2));
   } else {
     text_width = width() - text_x - edge_item_padding_;
   }
 
-  text_bounds_.SetRect(text_x, std::max(0, (height() - text_height) / 2),
-      std::max(text_width, 0), text_height);
+  text_bounds_.SetRect(text_x, 0, std::max(text_width, 0), height());
 }
 
 void OmniboxResultView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   animation_->SetSlideDuration(width() / 4);
 }
 
 void OmniboxResultView::OnPaint(gfx::Canvas* canvas) {
   const ResultViewState state = GetState();
   if (state != NORMAL)
     canvas->DrawColor(GetColor(state, BACKGROUND));
@@ skipping 15 matching lines @@
     int x = GetMirroredXForRect(keyword_text_bounds_);
     mirroring_context_->Initialize(x, keyword_text_bounds_.width());
     PaintMatch(canvas, *match_.associated_keyword.get(), x);
   }
 }
 
 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) {
   Layout();
   SchedulePaint();
 }