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

Side by Side Diff: Source/platform/scroll/Scrollbar.cpp

Issue 256623009: Merge 171683 "Makes windows repaint scrollbars when position cha..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1916/
Patch Set: Created 6 years, 8 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 | « LayoutTests/platform/win/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2004, 2006, 2008 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 19 matching lines...) Expand all
30 #include "platform/graphics/GraphicsContext.h" 30 #include "platform/graphics/GraphicsContext.h"
31 #include "platform/PlatformGestureEvent.h" 31 #include "platform/PlatformGestureEvent.h"
32 #include "platform/PlatformMouseEvent.h" 32 #include "platform/PlatformMouseEvent.h"
33 #include "platform/scroll/ScrollAnimator.h" 33 #include "platform/scroll/ScrollAnimator.h"
34 #include "platform/scroll/ScrollView.h" 34 #include "platform/scroll/ScrollView.h"
35 #include "platform/scroll/ScrollableArea.h" 35 #include "platform/scroll/ScrollableArea.h"
36 #include "platform/scroll/ScrollbarTheme.h" 36 #include "platform/scroll/ScrollbarTheme.h"
37 37
38 using namespace std; 38 using namespace std;
39 39
40 #if OS(POSIX) && !OS(MACOSX) 40 #if ((OS(POSIX) && !OS(MACOSX)) || OS(WIN))
41 // The position of the scrollbar thumb affects the appearance of the steppers, s o 41 // The position of the scrollbar thumb affects the appearance of the steppers, s o
42 // when the thumb moves, we have to invalidate them for painting. 42 // when the thumb moves, we have to invalidate them for painting.
43 #define THUMB_POSITION_AFFECTS_BUTTONS 43 #define THUMB_POSITION_AFFECTS_BUTTONS
44 #endif 44 #endif
45 45
46 namespace WebCore { 46 namespace WebCore {
47 47
48 PassRefPtr<Scrollbar> Scrollbar::create(ScrollableArea* scrollableArea, Scrollba rOrientation orientation, ScrollbarControlSize size) 48 PassRefPtr<Scrollbar> Scrollbar::create(ScrollableArea* scrollableArea, Scrollba rOrientation orientation, ScrollbarControlSize size)
49 { 49 {
50 return adoptRef(new Scrollbar(scrollableArea, orientation, size)); 50 return adoptRef(new Scrollbar(scrollableArea, orientation, size));
(...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
597 if (!m_scrollableArea) 597 if (!m_scrollableArea)
598 return 0; 598 return 0;
599 599
600 if (m_orientation == HorizontalScrollbar) 600 if (m_orientation == HorizontalScrollbar)
601 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu mScrollPosition().x(); 601 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu mScrollPosition().x();
602 602
603 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr ollPosition().y(); 603 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr ollPosition().y();
604 } 604 }
605 605
606 } // namespace WebCore 606 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/platform/win/virtual/softwarecompositing/overflow/updating-scrolling-content-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698