Chromium Code Reviews| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 #include "core/page/FrameTree.h" | 43 #include "core/page/FrameTree.h" |
| 44 #include "core/frame/FrameView.h" | 44 #include "core/frame/FrameView.h" |
| 45 #include "core/page/PageConsole.h" | 45 #include "core/page/PageConsole.h" |
| 46 #include "core/page/PageGroup.h" | 46 #include "core/page/PageGroup.h" |
| 47 #include "core/page/PageLifecycleNotifier.h" | 47 #include "core/page/PageLifecycleNotifier.h" |
| 48 #include "core/page/PointerLockController.h" | 48 #include "core/page/PointerLockController.h" |
| 49 #include "core/page/Settings.h" | 49 #include "core/page/Settings.h" |
| 50 #include "core/page/ValidationMessageClient.h" | 50 #include "core/page/ValidationMessageClient.h" |
| 51 #include "core/page/scrolling/ScrollingCoordinator.h" | 51 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 52 #include "core/plugins/PluginData.h" | 52 #include "core/plugins/PluginData.h" |
| 53 #include "core/rendering/RenderLayerCompositor.h" | |
|
Ian Vollick
2013/10/18 19:23:26
We don't need this, right?
| |
| 53 #include "core/rendering/RenderView.h" | 54 #include "core/rendering/RenderView.h" |
| 54 #include "core/storage/StorageNamespace.h" | 55 #include "core/storage/StorageNamespace.h" |
| 55 #include "wtf/HashMap.h" | 56 #include "wtf/HashMap.h" |
| 56 #include "wtf/RefCountedLeakCounter.h" | 57 #include "wtf/RefCountedLeakCounter.h" |
| 57 #include "wtf/StdLibExtras.h" | 58 #include "wtf/StdLibExtras.h" |
| 58 #include "wtf/text/Base64.h" | 59 #include "wtf/text/Base64.h" |
| 59 | 60 |
| 60 namespace WebCore { | 61 namespace WebCore { |
| 61 | 62 |
| 62 static HashSet<Page*>* allPages; | 63 static HashSet<Page*>* allPages; |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 216 ScrollingCoordinator* Page::scrollingCoordinator() | 217 ScrollingCoordinator* Page::scrollingCoordinator() |
| 217 { | 218 { |
| 218 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) | 219 if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) |
| 219 m_scrollingCoordinator = ScrollingCoordinator::create(this); | 220 m_scrollingCoordinator = ScrollingCoordinator::create(this); |
| 220 | 221 |
| 221 return m_scrollingCoordinator.get(); | 222 return m_scrollingCoordinator.get(); |
| 222 } | 223 } |
| 223 | 224 |
| 224 String Page::mainThreadScrollingReasonsAsText() | 225 String Page::mainThreadScrollingReasonsAsText() |
| 225 { | 226 { |
| 226 if (Document* document = m_mainFrame->document()) | |
| 227 document->updateLayout(); | |
| 228 | |
| 229 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) | 227 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) |
| 230 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); | 228 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); |
| 231 | 229 |
| 232 return String(); | 230 return String(); |
| 233 } | 231 } |
| 234 | 232 |
| 235 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) | 233 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) |
| 236 { | 234 { |
| 237 if (Document* document = m_mainFrame->document()) | 235 if (Document* document = m_mainFrame->document()) |
| 238 document->updateLayout(); | 236 document->updateLayout(); |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 609 , inspectorClient(0) | 607 , inspectorClient(0) |
| 610 , backForwardClient(0) | 608 , backForwardClient(0) |
| 611 { | 609 { |
| 612 } | 610 } |
| 613 | 611 |
| 614 Page::PageClients::~PageClients() | 612 Page::PageClients::~PageClients() |
| 615 { | 613 { |
| 616 } | 614 } |
| 617 | 615 |
| 618 } // namespace WebCore | 616 } // namespace WebCore |
| OLD | NEW |