Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

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

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
OLDNEW
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 20 matching lines...) Expand all
31 #include "platform/animation/TimingFunction.h" 31 #include "platform/animation/TimingFunction.h"
32 #include "platform/geometry/FloatRect.h" 32 #include "platform/geometry/FloatRect.h"
33 #include "platform/geometry/IntRect.h" 33 #include "platform/geometry/IntRect.h"
34 #include "platform/mac/BlockExceptions.h" 34 #include "platform/mac/BlockExceptions.h"
35 #include "platform/mac/NSScrollerImpDetails.h" 35 #include "platform/mac/NSScrollerImpDetails.h"
36 #include "platform/scroll/ScrollableArea.h" 36 #include "platform/scroll/ScrollableArea.h"
37 #include "platform/scroll/ScrollbarTheme.h" 37 #include "platform/scroll/ScrollbarTheme.h"
38 #include "platform/scroll/ScrollbarThemeMac.h" 38 #include "platform/scroll/ScrollbarThemeMac.h"
39 #include "public/platform/Platform.h" 39 #include "public/platform/Platform.h"
40 #include "public/platform/WebScheduler.h" 40 #include "public/platform/WebScheduler.h"
41 #include "wtf/MainThread.h"
42 #include "wtf/MathExtras.h" 41 #include "wtf/MathExtras.h"
43 #include "wtf/PassOwnPtr.h" 42 #include "wtf/PassOwnPtr.h"
44 43
45 using namespace blink; 44 using namespace blink;
46 45
47 static bool supportsUIStateTransitionProgress() 46 static bool supportsUIStateTransitionProgress()
48 { 47 {
49 // FIXME: This is temporary until all platforms that support ScrollbarPainte r support this part of the API. 48 // FIXME: This is temporary until all platforms that support ScrollbarPainte r support this part of the API.
50 static bool globalSupportsUIStateTransitionProgress = [NSClassFromString(@"N SScrollerImp") instancesRespondToSelector:@selector(mouseEnteredScroller)]; 49 static bool globalSupportsUIStateTransitionProgress = [NSClassFromString(@"N SScrollerImp") instancesRespondToSelector:@selector(mouseEnteredScroller)];
51 return globalSupportsUIStateTransitionProgress; 50 return globalSupportsUIStateTransitionProgress;
(...skipping 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar()) 1105 if (Scrollbar* verticalScrollbar = m_scrollableArea->verticalScrollbar())
1107 rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scr ollerThumb); 1106 rectInViewCoordinates = verticalScrollbar->convertToContainingWidget(scr ollerThumb);
1108 1107
1109 if (rectInViewCoordinates == m_visibleScrollerThumbRect) 1108 if (rectInViewCoordinates == m_visibleScrollerThumbRect)
1110 return; 1109 return;
1111 1110
1112 m_visibleScrollerThumbRect = rectInViewCoordinates; 1111 m_visibleScrollerThumbRect = rectInViewCoordinates;
1113 } 1112 }
1114 1113
1115 } // namespace blink 1114 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698