OLD | NEW |
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 Loading... |
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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 // A WebPagePopupImpl instance usually has two references. | 567 // A WebPagePopupImpl instance usually has two references. |
568 // - One owned by the instance itself. It represents the visible widget. | 568 // - One owned by the instance itself. It represents the visible widget. |
569 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 569 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
570 // WebPagePopupImpl to close. | 570 // WebPagePopupImpl to close. |
571 // We need them because the closing operation is asynchronous and the widget | 571 // We need them because the closing operation is asynchronous and the widget |
572 // can be closed while the WebViewImpl is unaware of it. | 572 // can be closed while the WebViewImpl is unaware of it. |
573 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 573 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
574 } | 574 } |
575 | 575 |
576 } // namespace blink | 576 } // namespace blink |
OLD | NEW |