Changeset 87130 in webkit
- Timestamp:
- May 23, 2011 11:39:27 PM (13 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 2 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r87128 r87130 1 2011-05-23 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r87118. 4 http://trac.webkit.org/changeset/87118 5 https://bugs.webkit.org/show_bug.cgi?id=61347 6 7 patch breaks layout tests 8 (https://bugs.webkit.org/show_bug.cgi?id=61342), and chromium 9 tests (browser_test MacTestCmdUp and ui_test Scrollbar) 10 (Requested by ukai_ on #webkit). 11 12 * WebCore.gyp/WebCore.gyp: 13 * WebCore.gypi: 14 * platform/ScrollAnimator.cpp: 15 * platform/chromium/ScrollAnimatorChromiumMac.h: Removed. 16 * platform/chromium/ScrollAnimatorChromiumMac.mm: Removed. 17 * platform/graphics/IntPoint.h: 18 1 19 2011-05-23 Julien Chaffraix <jchaffraix@codeaurora.org> 2 20 -
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
r87118 r87130 1147 1147 'WebCoreRenderThemeNotificationObserver=ChromiumWebCoreObjCWebCoreRenderThemeNotificationObserver', 1148 1148 'WebFontCache=ChromiumWebCoreObjCWebFontCache', 1149 'ScrollAnimationHelperDelegate=ChromiumWebCoreObjCScrollAnimationHelperDelegate',1150 'ScrollbarPainterControllerDelegate=ChromiumWebCoreObjCScrollbarPainterControllerDelegate',1151 'ScrollbarPainterDelegate=ChromiumWebCoreObjCScrollbarPainterDelegate',1152 'ScrollbarPartAnimation=ChromiumWebCoreObjCScrollbarPartAnimation',1153 1149 ], 1154 1150 'include_dirs': [ -
trunk/Source/WebCore/WebCore.gypi
r87125 r87130 3805 3805 'platform/chromium/ReadableDataObject.h', 3806 3806 'platform/chromium/SSLKeyGeneratorChromium.cpp', 3807 'platform/chromium/ScrollAnimatorChromiumMac.h',3808 'platform/chromium/ScrollAnimatorChromiumMac.mm',3809 3807 'platform/chromium/ScrollbarOverlayUtilitiesMac.h', 3810 3808 'platform/chromium/ScrollbarOverlayUtilitiesMac.mm', -
trunk/Source/WebCore/platform/ScrollAnimator.cpp
r87118 r87130 42 42 namespace WebCore { 43 43 44 #if !ENABLE(SMOOTH_SCROLLING) && !(PLATFORM(CHROMIUM) && OS(DARWIN))44 #if !ENABLE(SMOOTH_SCROLLING) 45 45 PassOwnPtr<ScrollAnimator> ScrollAnimator::create(ScrollableArea* scrollableArea) 46 46 { -
trunk/Source/WebCore/platform/graphics/IntPoint.h
r87118 r87130 38 38 39 39 40 #if OS(DARWIN)40 #if PLATFORM(MAC) 41 41 #ifdef NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 42 42 typedef struct CGPoint NSPoint; … … 120 120 #endif 121 121 122 #if OS(DARWIN) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES)122 #if PLATFORM(MAC) && !defined(NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES) 123 123 explicit IntPoint(const NSPoint&); // don't do this implicitly since it's lossy 124 124 operator NSPoint() const;
Note: See TracChangeset
for help on using the changeset viewer.