Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1040)

Side by Side Diff: Source/core/page/Page.cpp

Issue 1301033002: Plumb CompositedDisplayList to WebViewImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase from space, also minor cleanups Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "core/page/ChromeClient.h" 42 #include "core/page/ChromeClient.h"
43 #include "core/page/ContextMenuController.h" 43 #include "core/page/ContextMenuController.h"
44 #include "core/page/DragController.h" 44 #include "core/page/DragController.h"
45 #include "core/page/FocusController.h" 45 #include "core/page/FocusController.h"
46 #include "core/page/PointerLockController.h" 46 #include "core/page/PointerLockController.h"
47 #include "core/page/ValidationMessageClient.h" 47 #include "core/page/ValidationMessageClient.h"
48 #include "core/page/scrolling/ScrollingCoordinator.h" 48 #include "core/page/scrolling/ScrollingCoordinator.h"
49 #include "core/paint/DeprecatedPaintLayer.h" 49 #include "core/paint/DeprecatedPaintLayer.h"
50 #include "platform/graphics/GraphicsLayer.h" 50 #include "platform/graphics/GraphicsLayer.h"
51 #include "platform/plugins/PluginData.h" 51 #include "platform/plugins/PluginData.h"
52 #include "public/platform/WebCompositedDisplayList.h"
52 #include "wtf/RefCountedLeakCounter.h" 53 #include "wtf/RefCountedLeakCounter.h"
53 54
54 namespace blink { 55 namespace blink {
55 56
56 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page")); 57 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page"));
57 58
58 // static 59 // static
59 HashSet<Page*>& Page::allPages() 60 HashSet<Page*>& Page::allPages()
60 { 61 {
61 DEFINE_STATIC_LOCAL(HashSet<Page*>, allPages, ()); 62 DEFINE_STATIC_LOCAL(HashSet<Page*>, allPages, ());
(...skipping 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 // an event so we keep the frames alive until we are done. 526 // an event so we keep the frames alive until we are done.
526 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext() ) { 527 for (Frame* frame = mainFrame(); frame; frame = frame->tree().traverseNext() ) {
527 if (frame->isLocalFrame()) 528 if (frame->isLocalFrame())
528 frames.append(toLocalFrame(frame)); 529 frames.append(toLocalFrame(frame));
529 } 530 }
530 531
531 for (unsigned i = 0; i < frames.size(); ++i) 532 for (unsigned i = 0; i < frames.size(); ++i)
532 frames[i]->localDOMWindow()->acceptLanguagesChanged(); 533 frames[i]->localDOMWindow()->acceptLanguagesChanged();
533 } 534 }
534 535
536 void Page::setCompositedDisplayList(PassOwnPtr<CompositedDisplayList> composited DisplayList)
537 {
538 OwnPtr<WebCompositedDisplayList> webCompositedDisplayList = adoptPtr(new Web CompositedDisplayList(compositedDisplayList));
539 chromeClient().setCompositedDisplayList(webCompositedDisplayList.release());
540 }
541
542 CompositedDisplayList* Page::compositedDisplayListForTesting()
543 {
544 if (WebCompositedDisplayList* compositedDisplayList = chromeClient().composi tedDisplayListForTesting())
545 return compositedDisplayList->compositedDisplayListForTesting();
546 return nullptr;
547 }
548
535 DEFINE_TRACE(Page) 549 DEFINE_TRACE(Page)
536 { 550 {
537 #if ENABLE(OILPAN) 551 #if ENABLE(OILPAN)
538 visitor->trace(m_animator); 552 visitor->trace(m_animator);
539 visitor->trace(m_autoscrollController); 553 visitor->trace(m_autoscrollController);
540 visitor->trace(m_dragCaretController); 554 visitor->trace(m_dragCaretController);
541 visitor->trace(m_dragController); 555 visitor->trace(m_dragController);
542 visitor->trace(m_focusController); 556 visitor->trace(m_focusController);
543 visitor->trace(m_contextMenuController); 557 visitor->trace(m_contextMenuController);
544 visitor->trace(m_pointerLockController); 558 visitor->trace(m_pointerLockController);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 { 608 {
595 } 609 }
596 610
597 Page::PageClients::~PageClients() 611 Page::PageClients::~PageClients()
598 { 612 {
599 } 613 }
600 614
601 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>; 615 template class CORE_TEMPLATE_EXPORT WillBeHeapSupplement<Page>;
602 616
603 } // namespace blink 617 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698