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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
159 ordinaryPages().add(this); | 159 ordinaryPages().add(this); |
160 } | 160 } |
161 | 161 |
162 ViewportDescription Page::viewportDescription() const | 162 ViewportDescription Page::viewportDescription() const |
163 { | 163 { |
164 return mainFrame() && mainFrame()->document() ? mainFrame()->document()->vie wportDescription() : ViewportDescription(); | 164 return mainFrame() && mainFrame()->document() ? mainFrame()->document()->vie wportDescription() : ViewportDescription(); |
165 } | 165 } |
166 | 166 |
167 ScrollingCoordinator* Page::scrollingCoordinator() | 167 ScrollingCoordinator* Page::scrollingCoordinator() |
168 { | 168 { |
169 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) | 169 if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled()) |
jamesr
2014/06/11 21:44:10
isn't the bit after the && always true?
| |
170 m_scrollingCoordinator = ScrollingCoordinator::create(this); | 170 m_scrollingCoordinator = ScrollingCoordinator::create(this); |
171 | 171 |
172 return m_scrollingCoordinator.get(); | 172 return m_scrollingCoordinator.get(); |
173 } | 173 } |
174 | 174 |
175 String Page::mainThreadScrollingReasonsAsText() | 175 String Page::mainThreadScrollingReasonsAsText() |
176 { | 176 { |
177 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) | 177 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) |
178 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); | 178 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); |
179 | 179 |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
632 , spellCheckerClient(0) | 632 , spellCheckerClient(0) |
633 , storageClient(0) | 633 , storageClient(0) |
634 { | 634 { |
635 } | 635 } |
636 | 636 |
637 Page::PageClients::~PageClients() | 637 Page::PageClients::~PageClients() |
638 { | 638 { |
639 } | 639 } |
640 | 640 |
641 } // namespace WebCore | 641 } // namespace WebCore |
OLD | NEW |