Skip to content

Commit

Permalink
Fix CanScrollOrientation method name.
Browse files Browse the repository at this point in the history
Change the method name from can_scroll_orientation() to
CanScrollOrienattion() to comply with the style guide.

This is a follow up to https://codereview.chromium.org/655783004

BUG=370892

Review URL: https://codereview.chromium.org/637283004

Cr-Commit-Position: refs/heads/master@{#299803}
  • Loading branch information
timav authored and Commit bot committed Oct 16, 2014
1 parent 0a14108 commit 87a47f5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cc/animation/scrollbar_animation_controller_linear_fade.cc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void ScrollbarAnimationControllerLinearFade::ApplyOpacityToScrollbars(
ScrollbarLayerImplBase* scrollbar = *it;

if (scrollbar->is_overlay_scrollbar())
scrollbar->SetOpacity(scrollbar->can_scroll_orientation() ? opacity : 0);
scrollbar->SetOpacity(scrollbar->CanScrollOrientation() ? opacity : 0);
}
}

Expand Down
2 changes: 1 addition & 1 deletion cc/animation/scrollbar_animation_controller_thinning.cc
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ void ScrollbarAnimationControllerThinning::ApplyOpacityAndThumbThicknessScale(
ScrollbarLayerImplBase* scrollbar = *it;
if (scrollbar->is_overlay_scrollbar()) {
float effectiveOpacity =
scrollbar->can_scroll_orientation()
scrollbar->CanScrollOrientation()
? AdjustScale(opacity, scrollbar->opacity(), opacity_change_)
: 0;

Expand Down
2 changes: 1 addition & 1 deletion cc/layers/scrollbar_layer_impl_base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ bool ScrollbarLayerImplBase::SetMaximum(int maximum) {
return true;
}

bool ScrollbarLayerImplBase::can_scroll_orientation() const {
bool ScrollbarLayerImplBase::CanScrollOrientation() const {
if (!scroll_layer_)
return false;
return scroll_layer_->user_scrollable(orientation()) && (0 < maximum());
Expand Down
2 changes: 1 addition & 1 deletion cc/layers/scrollbar_layer_impl_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class CC_EXPORT ScrollbarLayerImplBase : public LayerImpl {
return is_left_side_vertical_scrollbar_;
}

bool can_scroll_orientation() const;
bool CanScrollOrientation() const;

virtual void PushPropertiesTo(LayerImpl* layer) override;
virtual ScrollbarLayerImplBase* ToScrollbarLayer() override;
Expand Down

0 comments on commit 87a47f5

Please sign in to comment.