Add a noise indicator to the speech bubble volume indicator.

chrome/browser/speech/speech_input_bubble.cc

 // Copyright (c) 2011 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/tab_contents/tab_contents.h"
 #include "chrome/browser/speech/speech_input_bubble.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/rect.h"
 
 SpeechInputBubble::FactoryMethod SpeechInputBubble::factory_ = NULL;
-const int SpeechInputBubble::kBubbleTargetOffsetX = 5;
+const int SpeechInputBubble::kBubbleTargetOffsetX = 10;
 
 SkBitmap* SpeechInputBubbleBase::mic_empty_ = NULL;
+SkBitmap* SpeechInputBubbleBase::mic_noise_ = NULL;
 SkBitmap* SpeechInputBubbleBase::mic_full_ = NULL;
 SkBitmap* SpeechInputBubbleBase::mic_mask_ = NULL;
 SkBitmap* SpeechInputBubbleBase::spinner_ = NULL;
 const int SpeechInputBubbleBase::kRecognizingAnimationStepMs = 100;
 
 SpeechInputBubble* SpeechInputBubble::Create(TabContents* tab_contents,
                                              Delegate* delegate,
                                              const gfx::Rect& element_rect) {
   if (factory_)
     return (*factory_)(tab_contents, delegate, element_rect);
 
   // Has the tab already closed before bubble create request was processed?
   if (!tab_contents)
     return NULL;
 
   return CreateNativeBubble(tab_contents, delegate, element_rect);
 }
 
 SpeechInputBubbleBase::SpeechInputBubbleBase(TabContents* tab_contents)
     : ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)),
       display_mode_(DISPLAY_MODE_RECORDING),
       tab_contents_(tab_contents) {
   if (!mic_empty_) {  // Static variables.
     mic_empty_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_SPEECH_INPUT_MIC_EMPTY);
+    mic_noise_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+        IDR_SPEECH_INPUT_MIC_NOISE);
     mic_full_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_SPEECH_INPUT_MIC_FULL);
     mic_mask_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_SPEECH_INPUT_MIC_MASK);
     spinner_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
         IDR_SPEECH_INPUT_SPINNER);
   }
 
   // Instance variables.
   mic_image_.reset(new SkBitmap());
@@ skipping 34 matching lines @@
 }
 
 void SpeechInputBubbleBase::SetRecordingMode() {
   task_factory_.RevokeAll();
   display_mode_ = DISPLAY_MODE_RECORDING;
   UpdateLayout();
 }
 
 void SpeechInputBubbleBase::SetRecognizingMode() {
   display_mode_ = DISPLAY_MODE_RECOGNIZING;
+  animation_step_ = 0;
+  DoRecognizingAnimationStep();
   UpdateLayout();
-
-  animation_step_ = 0;
-  MessageLoop::current()->PostDelayedTask(
-      FROM_HERE,
-      task_factory_.NewRunnableMethod(
-          &SpeechInputBubbleBase::DoRecognizingAnimationStep),
-      kRecognizingAnimationStepMs);
 }
 
 void SpeechInputBubbleBase::DoRecognizingAnimationStep() {
   SetImage(animation_frames_[animation_step_]);
   if (++animation_step_ >= static_cast<int>(animation_frames_.size()))
     animation_step_ = 0;
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       task_factory_.NewRunnableMethod(
           &SpeechInputBubbleBase::DoRecognizingAnimationStep),
       kRecognizingAnimationStepMs);
 }
 
 void SpeechInputBubbleBase::SetMessage(const string16& text) {
   task_factory_.RevokeAll();
   message_text_ = text;
   display_mode_ = DISPLAY_MODE_MESSAGE;
   UpdateLayout();
 }
 
-void SpeechInputBubbleBase::SetInputVolume(float volume) {
-  mic_image_->eraseARGB(0, 0, 0, 0);
+void SpeechInputBubbleBase::DrawVolumeOverlay(SkCanvas& canvas,
+                                              SkBitmap* bitmap,
+                                              float volume) {
   buffer_image_->eraseARGB(0, 0, 0, 0);
 
   int width = mic_image_->width();
   int height = mic_image_->height();
-  SkCanvas canvas(*mic_image_);
   SkCanvas buffer_canvas(*buffer_image_);
 
-  // The 'full volume' mic image is drawn clipped to the current volume level,
-  // and a gradient mask is applied over it with the 'multiply' compositing
-  // operator to show soft edges at the top.
   buffer_canvas.save();
-  SkScalar clip_top = ((1.0f - volume) * height * 3) / 2.0f - height / 2.0f;
-  buffer_canvas.clipRect(SkRect::MakeLTRB(0, clip_top,
-      SkIntToScalar(width), SkIntToScalar(height)));
-  buffer_canvas.drawBitmap(*mic_full_, 0, 0);
+  SkScalar clip_right = (((1.0f - volume) * (width * 13)) - width) / 12.0f;

[bulach, 2011/03/01 17:39:04]

it'd be great to have these magical 13 and 12.0 as named constants..

+  buffer_canvas.clipRect(SkRect::MakeLTRB(0, 0,
+      SkIntToScalar(width) - clip_right, SkIntToScalar(height)));
+  buffer_canvas.drawBitmap(*bitmap, 0, 0);

[bulach, 2011/03/01 17:39:04]

I guess bitmap can be const&

   buffer_canvas.restore();
   SkPaint multiply_paint;
   multiply_paint.setXfermode(SkXfermode::Create(SkXfermode::kMultiply_Mode));
-  buffer_canvas.drawBitmap(*mic_mask_, 0, clip_top, &multiply_paint);
+  buffer_canvas.drawBitmap(*mic_mask_, -clip_right, 0, &multiply_paint);
 
-  // Draw the empty volume image first and the current volume image on top.
+  canvas.drawBitmap(*buffer_image_.get(), 0, 0);

[bulach, 2011/03/01 17:39:04]

and canvas a *

+}
+
+void SpeechInputBubbleBase::SetInputVolume(float volume, float noise_volume) {
+  mic_image_->eraseARGB(0, 0, 0, 0);
+  SkCanvas canvas(*mic_image_);
+
+  // Draw the empty volume image first and the current volume image on top,
+  // and then the noise volume image on top of both.
   canvas.drawBitmap(*mic_empty_, 0, 0);
-  canvas.drawBitmap(*buffer_image_.get(), 0, 0);
+  DrawVolumeOverlay(canvas, mic_full_, volume);
+  DrawVolumeOverlay(canvas, mic_noise_, noise_volume);
 
   SetImage(*mic_image_.get());
 }
 
 TabContents* SpeechInputBubbleBase::tab_contents() {
   return tab_contents_;
 }