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

Side by Side Diff: third_party/WebKit/Source/web/WebPagePopupImpl.cpp

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add WTF_MAKE_NONCOPYABLE. Remove INSIDE_BLINK for keyframes. Created 4 years, 10 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 m_popup->m_webView->scheduleAnimation(); 123 m_popup->m_webView->scheduleAnimation();
124 124
125 if (m_popup->isAcceleratedCompositingActive()) { 125 if (m_popup->isAcceleratedCompositingActive()) {
126 ASSERT(m_popup->m_layerTreeView); 126 ASSERT(m_popup->m_layerTreeView);
127 m_popup->m_layerTreeView->setNeedsBeginFrame(); 127 m_popup->m_layerTreeView->setNeedsBeginFrame();
128 return; 128 return;
129 } 129 }
130 m_popup->m_widgetClient->scheduleAnimation(); 130 m_popup->m_widgetClient->scheduleAnimation();
131 } 131 }
132 132
133 void attachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timel ine, LocalFrame*) override 133 void attachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline , LocalFrame*) override
134 { 134 {
135 if (m_popup->m_layerTreeView) 135 if (m_popup->m_layerTreeView)
136 m_popup->m_layerTreeView->attachCompositorAnimationTimeline(timeline ); 136 m_popup->m_layerTreeView->attachCompositorAnimationTimeline(timeline ->animationTimeline());
137 } 137 }
138 138
139 void detachCompositorAnimationTimeline(WebCompositorAnimationTimeline* timel ine, LocalFrame*) override 139 void detachCompositorAnimationTimeline(CompositorAnimationTimeline* timeline , LocalFrame*) override
140 { 140 {
141 if (m_popup->m_layerTreeView) 141 if (m_popup->m_layerTreeView)
142 m_popup->m_layerTreeView->detachCompositorAnimationTimeline(timeline ); 142 m_popup->m_layerTreeView->detachCompositorAnimationTimeline(timeline ->animationTimeline());
143 } 143 }
144 144
145 WebScreenInfo screenInfo() const override 145 WebScreenInfo screenInfo() const override
146 { 146 {
147 return m_popup->m_webView->client() ? m_popup->m_webView->client()->scre enInfo() : WebScreenInfo(); 147 return m_popup->m_webView->client() ? m_popup->m_webView->client()->scre enInfo() : WebScreenInfo();
148 } 148 }
149 149
150 void* webView() const override 150 void* webView() const override
151 { 151 {
152 return m_popup->m_webView; 152 return m_popup->m_webView;
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 // A WebPagePopupImpl instance usually has two references. 558 // A WebPagePopupImpl instance usually has two references.
559 // - One owned by the instance itself. It represents the visible widget. 559 // - One owned by the instance itself. It represents the visible widget.
560 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the 560 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
561 // WebPagePopupImpl to close. 561 // WebPagePopupImpl to close.
562 // We need them because the closing operation is asynchronous and the widget 562 // We need them because the closing operation is asynchronous and the widget
563 // can be closed while the WebViewImpl is unaware of it. 563 // can be closed while the WebViewImpl is unaware of it.
564 return adoptRef(new WebPagePopupImpl(client)).leakRef(); 564 return adoptRef(new WebPagePopupImpl(client)).leakRef();
565 } 565 }
566 566
567 } // namespace blink 567 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698