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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
129 #if USE(ACCELERATED_COMPOSITING) | 129 #if USE(ACCELERATED_COMPOSITING) |
130 RenderView* renderView = m_page->mainFrame()->contentRenderer(); | 130 RenderView* renderView = m_page->mainFrame()->contentRenderer(); |
131 if (!renderView) | 131 if (!renderView) |
132 return false; | 132 return false; |
133 return renderView->usesCompositing(); | 133 return renderView->usesCompositing(); |
134 #else | 134 #else |
135 return false; | 135 return false; |
136 #endif | 136 #endif |
137 } | 137 } |
138 | 138 |
139 Region ScrollingCoordinator::computeNonFastScrollableRegion(Frame* frame, const
IntPoint& frameLocation) | 139 Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame* frame,
const IntPoint& frameLocation) const |
140 { | 140 { |
141 Region nonFastScrollableRegion; | 141 Region nonFastScrollableRegion; |
142 FrameView* frameView = frame->view(); | 142 FrameView* frameView = frame->view(); |
143 if (!frameView) | 143 if (!frameView) |
144 return nonFastScrollableRegion; | 144 return nonFastScrollableRegion; |
145 | 145 |
146 IntPoint offset = frameLocation; | 146 IntPoint offset = frameLocation; |
147 offset.moveBy(frameView->frameRect().location()); | 147 offset.moveBy(frameView->frameRect().location()); |
148 | 148 |
149 if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrolla
bleAreas()) { | 149 if (const FrameView::ScrollableAreaSet* scrollableAreas = frameView->scrolla
bleAreas()) { |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 stringBuilder.resize(stringBuilder.length() - 2); | 481 stringBuilder.resize(stringBuilder.length() - 2); |
482 return stringBuilder.toString(); | 482 return stringBuilder.toString(); |
483 } | 483 } |
484 | 484 |
485 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const | 485 String ScrollingCoordinator::mainThreadScrollingReasonsAsText() const |
486 { | 486 { |
487 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); | 487 return mainThreadScrollingReasonsAsText(mainThreadScrollingReasons()); |
488 } | 488 } |
489 | 489 |
490 } // namespace WebCore | 490 } // namespace WebCore |
OLD | NEW |