| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All R
ights Reserved. |
| 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 3 * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 } | 162 } |
| 163 | 163 |
| 164 String Page::mainThreadScrollingReasonsAsText() | 164 String Page::mainThreadScrollingReasonsAsText() |
| 165 { | 165 { |
| 166 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) | 166 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) |
| 167 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); | 167 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); |
| 168 | 168 |
| 169 return String(); | 169 return String(); |
| 170 } | 170 } |
| 171 | 171 |
| 172 PassRefPtrWillBeRawPtr<ClientRectList> Page::nonFastScrollableRects(const LocalF
rame* frame) | 172 ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) |
| 173 { | 173 { |
| 174 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) { | 174 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) { |
| 175 // Hits in compositing/iframes/iframe-composited-scrolling.html | 175 // Hits in compositing/iframes/iframe-composited-scrolling.html |
| 176 DisableCompositingQueryAsserts disabler; | 176 DisableCompositingQueryAsserts disabler; |
| 177 scrollingCoordinator->updateAfterCompositingChangeIfNeeded(); | 177 scrollingCoordinator->updateAfterCompositingChangeIfNeeded(); |
| 178 } | 178 } |
| 179 | 179 |
| 180 // Now retain non-fast scrollable regions | 180 // Now retain non-fast scrollable regions |
| 181 return ClientRectList::create(frame->view()->layerForScrolling()->platformLa
yer()->nonFastScrollableRegion()); | 181 return ClientRectList::create(frame->view()->layerForScrolling()->platformLa
yer()->nonFastScrollableRegion()); |
| 182 } | 182 } |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 595 { | 595 { |
| 596 } | 596 } |
| 597 | 597 |
| 598 Page::PageClients::~PageClients() | 598 Page::PageClients::~PageClients() |
| 599 { | 599 { |
| 600 } | 600 } |
| 601 | 601 |
| 602 template class WillBeHeapSupplement<Page>; | 602 template class WillBeHeapSupplement<Page>; |
| 603 | 603 |
| 604 } // namespace blink | 604 } // namespace blink |
| OLD | NEW |