| Index: Source/core/platform/ScrollableArea.cpp
|
| diff --git a/Source/core/platform/ScrollableArea.cpp b/Source/core/platform/ScrollableArea.cpp
|
| index 3075a11188b780d4af629abc32d52f0fc3d974a6..96999b5ab20276dcfe1c1b69b766d7bec06e30dd 100644
|
| --- a/Source/core/platform/ScrollableArea.cpp
|
| +++ b/Source/core/platform/ScrollableArea.cpp
|
| @@ -1,11 +1,11 @@
|
| /*
|
| * Copyright (c) 2010, Google Inc. All rights reserved.
|
| * Copyright (C) 2008, 2011 Apple Inc. All Rights Reserved.
|
| - *
|
| + *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are
|
| * met:
|
| - *
|
| + *
|
| * * Redistributions of source code must retain the above copyright
|
| * notice, this list of conditions and the following disclaimer.
|
| * * Redistributions in binary form must reproduce the above
|
| @@ -15,7 +15,7 @@
|
| * * Neither the name of Google Inc. nor the names of its
|
| * contributors may be used to endorse or promote products derived from
|
| * this software without specific prior written permission.
|
| - *
|
| + *
|
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
| @@ -208,7 +208,7 @@ void ScrollableArea::willEndLiveResize()
|
| m_inLiveResize = false;
|
| if (ScrollAnimator* scrollAnimator = existingScrollAnimator())
|
| scrollAnimator->willEndLiveResize();
|
| -}
|
| +}
|
|
|
| void ScrollableArea::contentAreaWillPaint() const
|
| {
|
| @@ -308,7 +308,7 @@ void ScrollableArea::setScrollbarOverlayStyle(ScrollbarOverlayStyle overlayStyle
|
| ScrollbarTheme::theme()->updateScrollbarOverlayStyle(horizontalScrollbar());
|
| horizontalScrollbar()->invalidate();
|
| }
|
| -
|
| +
|
| if (verticalScrollbar()) {
|
| ScrollbarTheme::theme()->updateScrollbarOverlayStyle(verticalScrollbar());
|
| verticalScrollbar()->invalidate();
|
|
|