Source/platform/mac/ScrollAnimatorMac.mm - Issue 641733004: Merge FrameView and ScrollView.

Side by Side Diff: Source/platform/mac/ScrollAnimatorMac.mm

Issue 641733004: Merge FrameView and ScrollView. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Rebaseline. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/platform/blink_platform.gypi ('k') | Source/platform/mac/ThemeMac.h » ('j') | no next file with comments »

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 17 matching lines...) Expand all Loading...
28 #include "platform/mac/ScrollAnimatorMac.h"	28 #include "platform/mac/ScrollAnimatorMac.h"

29	29

30 #include "platform/PlatformGestureEvent.h"	30 #include "platform/PlatformGestureEvent.h"

31 #include "platform/PlatformWheelEvent.h"	31 #include "platform/PlatformWheelEvent.h"

32 #include "platform/Timer.h"	32 #include "platform/Timer.h"

33 #include "platform/animation/TimingFunction.h"	33 #include "platform/animation/TimingFunction.h"

34 #include "platform/geometry/FloatRect.h"	34 #include "platform/geometry/FloatRect.h"

35 #include "platform/geometry/IntRect.h"	35 #include "platform/geometry/IntRect.h"

36 #include "platform/mac/BlockExceptions.h"	36 #include "platform/mac/BlockExceptions.h"

37 #include "platform/mac/NSScrollerImpDetails.h"	37 #include "platform/mac/NSScrollerImpDetails.h"

38 #include "platform/scroll/ScrollView.h"

39 #include "platform/scroll/ScrollableArea.h"	38 #include "platform/scroll/ScrollableArea.h"

40 #include "platform/scroll/ScrollbarTheme.h"	39 #include "platform/scroll/ScrollbarTheme.h"

41 #include "platform/scroll/ScrollbarThemeMacCommon.h"	40 #include "platform/scroll/ScrollbarThemeMacCommon.h"

42 #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h"	41 #include "platform/scroll/ScrollbarThemeMacOverlayAPI.h"

43 #include "wtf/MainThread.h"	42 #include "wtf/MainThread.h"

44 #include "wtf/PassOwnPtr.h"	43 #include "wtf/PassOwnPtr.h"

45	44

46 using namespace blink;	45 using namespace blink;

47	46

48 static bool supportsUIStateTransitionProgress()	47 static bool supportsUIStateTransitionProgress()

(...skipping 1312 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1361 return;	1360 return;

1362	1361

1363 m_visibleScrollerThumbRect = rectInViewCoordinates;	1362 m_visibleScrollerThumbRect = rectInViewCoordinates;

1364 }	1363 }

1365	1364

1366 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() {	1365 bool ScrollAnimatorMac::canUseCoordinatedScrollbar() {

1367 return ScrollbarThemeMacCommon::isOverlayAPIAvailable();	1366 return ScrollbarThemeMacCommon::isOverlayAPIAvailable();

1368 }	1367 }

1369	1368

1370 } // namespace blink	1369 } // namespace blink

OLD	NEW