| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 } | 478 } |
| 479 | 479 |
| 480 - (NSRect)convertRectFromBacking:(NSRect)aRect { | 480 - (NSRect)convertRectFromBacking:(NSRect)aRect { |
| 481 return aRect; | 481 return aRect; |
| 482 } | 482 } |
| 483 | 483 |
| 484 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp { | 484 - (NSPoint)mouseLocationInScrollerForScrollerImp:(id)scrollerImp { |
| 485 if (!_scrollbar) | 485 if (!_scrollbar) |
| 486 return NSZeroPoint; | 486 return NSZeroPoint; |
| 487 | 487 |
| 488 ASSERT_UNUSED(scrollerImp, | 488 DCHECK_EQ(scrollerImp, scrollbarPainterForScrollbar(*_scrollbar)); |
| 489 scrollerImp == scrollbarPainterForScrollbar(*_scrollbar)); | |
| 490 | 489 |
| 491 return _scrollbar->convertFromContainingWidget( | 490 return _scrollbar->convertFromContainingWidget( |
| 492 _scrollbar->getScrollableArea()->lastKnownMousePosition()); | 491 _scrollbar->getScrollableArea()->lastKnownMousePosition()); |
| 493 } | 492 } |
| 494 | 493 |
| 495 - (void)setUpAlphaAnimation: | 494 - (void)setUpAlphaAnimation: |
| 496 (RetainPtr<BlinkScrollbarPartAnimation>&)scrollbarPartAnimation | 495 (RetainPtr<BlinkScrollbarPartAnimation>&)scrollbarPartAnimation |
| 497 scrollerPainter:(ScrollbarPainter)scrollerPainter | 496 scrollerPainter:(ScrollbarPainter)scrollerPainter |
| 498 part:(blink::ScrollbarPart)part | 497 part:(blink::ScrollbarPart)part |
| 499 animateAlphaTo:(CGFloat)newAlpha | 498 animateAlphaTo:(CGFloat)newAlpha |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 rectInViewCoordinates = | 1113 rectInViewCoordinates = |
| 1115 verticalScrollbar->convertToContainingWidget(scrollerThumb); | 1114 verticalScrollbar->convertToContainingWidget(scrollerThumb); |
| 1116 | 1115 |
| 1117 if (rectInViewCoordinates == m_visibleScrollerThumbRect) | 1116 if (rectInViewCoordinates == m_visibleScrollerThumbRect) |
| 1118 return; | 1117 return; |
| 1119 | 1118 |
| 1120 m_visibleScrollerThumbRect = rectInViewCoordinates; | 1119 m_visibleScrollerThumbRect = rectInViewCoordinates; |
| 1121 } | 1120 } |
| 1122 | 1121 |
| 1123 } // namespace blink | 1122 } // namespace blink |
| OLD | NEW |