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

Side by Side Diff: Source/web/ChromeClientImpl.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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 if (!webFrame->frameWidget()) { 714 if (!webFrame->frameWidget()) {
715 m_webView->setRootGraphicsLayer(rootLayer); 715 m_webView->setRootGraphicsLayer(rootLayer);
716 return; 716 return;
717 } 717 }
718 ASSERT(webFrame); 718 ASSERT(webFrame);
719 ASSERT(webFrame->frameWidget()); 719 ASSERT(webFrame->frameWidget());
720 toWebFrameWidgetImpl(webFrame->frameWidget())->setRootGraphicsLayer(root Layer); 720 toWebFrameWidgetImpl(webFrame->frameWidget())->setRootGraphicsLayer(root Layer);
721 } 721 }
722 } 722 }
723 723
724 void ChromeClientImpl::setCompositedDisplayList(PassOwnPtr<WebCompositedDisplayL ist> compositedDisplayList)
725 {
726 m_webView->setCompositedDisplayList(compositedDisplayList.leakPtr());
727 }
728
729 WebCompositedDisplayList* ChromeClientImpl::compositedDisplayListForTesting()
730 {
731 return m_webView->compositedDisplayList();
732 }
733
724 void ChromeClientImpl::attachCompositorAnimationTimeline(WebCompositorAnimationT imeline* compositorTimeline, LocalFrame* localRoot) 734 void ChromeClientImpl::attachCompositorAnimationTimeline(WebCompositorAnimationT imeline* compositorTimeline, LocalFrame* localRoot)
725 { 735 {
726 // FIXME: For top-level frames we still use the WebView as a WebWidget. This 736 // FIXME: For top-level frames we still use the WebView as a WebWidget. This
727 // special case will be removed when top-level frames get WebFrameWidgets. 737 // special case will be removed when top-level frames get WebFrameWidgets.
728 if (localRoot->isMainFrame()) { 738 if (localRoot->isMainFrame()) {
729 m_webView->attachCompositorAnimationTimeline(compositorTimeline); 739 m_webView->attachCompositorAnimationTimeline(compositorTimeline);
730 } else { 740 } else {
731 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localRoot); 741 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(localRoot);
732 // FIXME: The following conditional is only needed for staging until the 742 // FIXME: The following conditional is only needed for staging until the
733 // Chromium patch lands that instantiates a WebFrameWidget. 743 // Chromium patch lands that instantiates a WebFrameWidget.
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
976 for (const auto& observer : observers) 986 for (const auto& observer : observers)
977 observer->willOpenPopup(); 987 observer->willOpenPopup();
978 } 988 }
979 989
980 FloatSize ChromeClientImpl::elasticOverscroll() const 990 FloatSize ChromeClientImpl::elasticOverscroll() const
981 { 991 {
982 return m_webView->elasticOverscroll(); 992 return m_webView->elasticOverscroll();
983 } 993 }
984 994
985 } // namespace blink 995 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698