Merge pull request #59 from crosswalk-project/backport

Backport upstream r210813 to fix Aura color chooser crash on Debug build
crosswalk-project · Sep 5, 2013 · 30efd9a · 30efd9a
2 parents 805a3ae + ad6709e
commit 30efd9a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ui/views/color_chooser/color_chooser_view.cc b/ui/views/color_chooser/color_chooser_view.cc
@@ -256,7 +256,6 @@ void ColorChooserView::SaturationValueView::OnSaturationValueChanged(
   marker_position_.set_x(x);
   marker_position_.set_y(y);
   SchedulePaint();
-  chooser_view_->OnSaturationValueChosen(saturation, value);
 }
 
 void ColorChooserView::SaturationValueView::ProcessEventAtLocation(
@@ -269,6 +268,7 @@ void ColorChooserView::SaturationValueView::ProcessEventAtLocation(
   saturation = SkScalarPin(saturation, 0, SK_Scalar1);
   value = SkScalarPin(value, 0, SK_Scalar1);
   OnSaturationValueChanged(saturation, value);
+  chooser_view_->OnSaturationValueChosen(saturation, value);
 }
 
 gfx::Size ColorChooserView::SaturationValueView::GetPreferredSize() {