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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 44 #include "core/page/FrameTree.h" | 44 #include "core/page/FrameTree.h" |
| 45 #include "core/frame/FrameView.h" | 45 #include "core/frame/FrameView.h" |
| 46 #include "core/page/PageConsole.h" | 46 #include "core/page/PageConsole.h" |
| 47 #include "core/page/PageGroup.h" | 47 #include "core/page/PageGroup.h" |
| 48 #include "core/page/PageLifecycleNotifier.h" | 48 #include "core/page/PageLifecycleNotifier.h" |
| 49 #include "core/page/PointerLockController.h" | 49 #include "core/page/PointerLockController.h" |
| 50 #include "core/page/Settings.h" | 50 #include "core/page/Settings.h" |
| 51 #include "core/page/ValidationMessageClient.h" | 51 #include "core/page/ValidationMessageClient.h" |
| 52 #include "core/page/scrolling/ScrollingCoordinator.h" | 52 #include "core/page/scrolling/ScrollingCoordinator.h" |
| 53 #include "core/plugins/PluginData.h" | 53 #include "core/plugins/PluginData.h" |
| 54 #include "core/rendering/RenderLayerCompositor.h" | |
| 54 #include "core/rendering/RenderView.h" | 55 #include "core/rendering/RenderView.h" |
| 55 #include "core/storage/StorageNamespace.h" | 56 #include "core/storage/StorageNamespace.h" |
| 56 #include "wtf/HashMap.h" | 57 #include "wtf/HashMap.h" |
| 57 #include "wtf/RefCountedLeakCounter.h" | 58 #include "wtf/RefCountedLeakCounter.h" |
| 58 #include "wtf/StdLibExtras.h" | 59 #include "wtf/StdLibExtras.h" |
| 59 #include "wtf/text/Base64.h" | 60 #include "wtf/text/Base64.h" |
| 60 | 61 |
| 61 namespace WebCore { | 62 namespace WebCore { |
| 62 | 63 |
| 63 static HashSet<Page*>* allPages; | 64 static HashSet<Page*>* allPages; |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 220 m_scrollingCoordinator = ScrollingCoordinator::create(this); | 221 m_scrollingCoordinator = ScrollingCoordinator::create(this); |
| 221 | 222 |
| 222 return m_scrollingCoordinator.get(); | 223 return m_scrollingCoordinator.get(); |
| 223 } | 224 } |
| 224 | 225 |
| 225 String Page::mainThreadScrollingReasonsAsText() | 226 String Page::mainThreadScrollingReasonsAsText() |
| 226 { | 227 { |
| 227 if (Document* document = m_mainFrame->document()) | 228 if (Document* document = m_mainFrame->document()) |
| 228 document->updateLayout(); | 229 document->updateLayout(); |
| 229 | 230 |
| 231 if (m_mainFrame->contentRenderer() && m_mainFrame->contentRenderer()->compos itor()) | |
| 232 m_mainFrame->contentRenderer()->compositor()->updateCompositingLayers(Co mpositingUpdateFinishAllDeferredWork); | |
| 233 | |
| 230 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) | 234 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator( )) |
| 231 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); | 235 return scrollingCoordinator->mainThreadScrollingReasonsAsText(); |
|
Ian Vollick
2013/10/17 01:30:25
Perhaps this could be passed m_mainFrame->view().
shawnsingh
2013/10/17 01:44:04
Can you please clarify - are you suggesting that I
Ian Vollick
2013/10/17 15:24:24
Yeah. It's a minor point, but I thought it would b
| |
| 232 | 236 |
| 233 return String(); | 237 return String(); |
| 234 } | 238 } |
| 235 | 239 |
| 236 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) | 240 PassRefPtr<ClientRectList> Page::nonFastScrollableRects(const Frame* frame) |
| 237 { | 241 { |
| 238 if (Document* document = m_mainFrame->document()) | 242 if (Document* document = m_mainFrame->document()) |
| 239 document->updateLayout(); | 243 document->updateLayout(); |
| 240 | 244 |
| 241 Vector<IntRect> rects; | 245 Vector<IntRect> rects; |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 610 , inspectorClient(0) | 614 , inspectorClient(0) |
| 611 , backForwardClient(0) | 615 , backForwardClient(0) |
| 612 { | 616 { |
| 613 } | 617 } |
| 614 | 618 |
| 615 Page::PageClients::~PageClients() | 619 Page::PageClients::~PageClients() |
| 616 { | 620 { |
| 617 } | 621 } |
| 618 | 622 |
| 619 } // namespace WebCore | 623 } // namespace WebCore |
| OLD | NEW |