Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm - Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org>

Side by Side Diff

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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.mm

Issue 7044088: Merge 88286 - 2011-06-07 Sailesh Agrawal <sail@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/

Patch Set: Created 9 years, 6 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

« no previous file with comments | « Source/WebCore/platform/chromium/ScrollAnimatorChromiumMac.h ('k') | Source/WebCore/platform/graphics/IntPoint.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 1224 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1235 rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrol lerThumb);	1235 rectInViewCoordinates = verticalScrollbar->convertToContainingView(scrol lerThumb);

1236	1236

1237 if (rectInViewCoordinates == m_visibleScrollerThumbRect)	1237 if (rectInViewCoordinates == m_visibleScrollerThumbRect)

1238 return;	1238 return;

1239	1239

1240 m_scrollableArea->setVisibleScrollerThumbRect(rectInViewCoordinates);	1240 m_scrollableArea->setVisibleScrollerThumbRect(rectInViewCoordinates);

1241 m_visibleScrollerThumbRect = rectInViewCoordinates;	1241 m_visibleScrollerThumbRect = rectInViewCoordinates;

1242 }	1242 }

1243	1243

1244 } // namespace WebCore	1244 } // namespace WebCore

OLD	NEW