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

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

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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/core/platform/ScrollAnimator.cpp ('k') | Source/core/platform/SecureTextInput.h » ('j') | 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 24 matching lines...) Expand all
35 #include "core/platform/graphics/GraphicsContext.h" 35 #include "core/platform/graphics/GraphicsContext.h"
36 36
37 // FIXME: The following #includes are a layering violation and should be removed . 37 // FIXME: The following #includes are a layering violation and should be removed .
38 #include "core/accessibility/AXObjectCache.h" 38 #include "core/accessibility/AXObjectCache.h"
39 #include "core/page/EventHandler.h" 39 #include "core/page/EventHandler.h"
40 #include "core/page/Frame.h" 40 #include "core/page/Frame.h"
41 #include "core/page/FrameView.h" 41 #include "core/page/FrameView.h"
42 42
43 using namespace std; 43 using namespace std;
44 44
45 #if OS(UNIX) && !OS(DARWIN) 45 #if OS(UNIX) && !OS(MACOSX)
46 // The position of the scrollbar thumb affects the appearance of the steppers, s o 46 // The position of the scrollbar thumb affects the appearance of the steppers, s o
47 // when the thumb moves, we have to invalidate them for painting. 47 // when the thumb moves, we have to invalidate them for painting.
48 #define THUMB_POSITION_AFFECTS_BUTTONS 48 #define THUMB_POSITION_AFFECTS_BUTTONS
49 #endif 49 #endif
50 50
51 namespace WebCore { 51 namespace WebCore {
52 52
53 PassRefPtr<Scrollbar> Scrollbar::create(ScrollableArea* scrollableArea, Scrollba rOrientation orientation, ScrollbarControlSize size) 53 PassRefPtr<Scrollbar> Scrollbar::create(ScrollableArea* scrollableArea, Scrollba rOrientation orientation, ScrollbarControlSize size)
54 { 54 {
55 return adoptRef(new Scrollbar(scrollableArea, orientation, size)); 55 return adoptRef(new Scrollbar(scrollableArea, orientation, size));
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 if (!m_scrollableArea) 595 if (!m_scrollableArea)
596 return 0; 596 return 0;
597 597
598 if (m_orientation == HorizontalScrollbar) 598 if (m_orientation == HorizontalScrollbar)
599 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu mScrollPosition().x(); 599 return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimu mScrollPosition().x();
600 600
601 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr ollPosition().y(); 601 return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScr ollPosition().y();
602 } 602 }
603 603
604 } // namespace WebCore 604 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/platform/ScrollAnimator.cpp ('k') | Source/core/platform/SecureTextInput.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698