| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); | 142 void removeWebScrollbarLayer(ScrollableArea*, ScrollbarOrientation); |
| 143 | 143 |
| 144 bool frameViewIsDirty() const; | 144 bool frameViewIsDirty() const; |
| 145 | 145 |
| 146 using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLaye
r>>; | 146 using ScrollbarMap = HashMap<ScrollableArea*, OwnPtr<blink::WebScrollbarLaye
r>>; |
| 147 ScrollbarMap m_horizontalScrollbars; | 147 ScrollbarMap m_horizontalScrollbars; |
| 148 ScrollbarMap m_verticalScrollbars; | 148 ScrollbarMap m_verticalScrollbars; |
| 149 HashSet<const RenderLayer*> m_layersWithTouchRects; | 149 HashSet<const RenderLayer*> m_layersWithTouchRects; |
| 150 bool m_wasFrameScrollable; | 150 bool m_wasFrameScrollable; |
| 151 | 151 |
| 152 // This is retained for testing. | |
| 153 MainThreadScrollingReasons m_lastMainThreadScrollingReasons; | 152 MainThreadScrollingReasons m_lastMainThreadScrollingReasons; |
| 154 }; | 153 }; |
| 155 | 154 |
| 156 } // namespace blink | 155 } // namespace blink |
| 157 | 156 |
| 158 #endif // ScrollingCoordinator_h | 157 #endif // ScrollingCoordinator_h |
| OLD | NEW |