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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 2449853004: Getting rid of DelegatedFrameData (Closed)
Patch Set: nit Created 4 years, 1 month 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <set> 9 #include <set>
10 #include <tuple> 10 #include <tuple>
(...skipping 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1820 bool is_mobile_optimized = IsMobileOptimizedFrame(frame.metadata); 1820 bool is_mobile_optimized = IsMobileOptimizedFrame(frame.metadata);
1821 input_router_->NotifySiteIsMobileOptimized(is_mobile_optimized); 1821 input_router_->NotifySiteIsMobileOptimized(is_mobile_optimized);
1822 if (touch_emulator_) 1822 if (touch_emulator_)
1823 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized); 1823 touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
1824 1824
1825 if (view_) { 1825 if (view_) {
1826 view_->OnSwapCompositorFrame(compositor_frame_sink_id, std::move(frame)); 1826 view_->OnSwapCompositorFrame(compositor_frame_sink_id, std::move(frame));
1827 view_->DidReceiveRendererFrame(); 1827 view_->DidReceiveRendererFrame();
1828 } else { 1828 } else {
1829 cc::ReturnedResourceArray resources; 1829 cc::ReturnedResourceArray resources;
1830 if (frame.delegated_frame_data) { 1830 cc::TransferableResource::ReturnResources(frame.resource_list, &resources);
1831 cc::TransferableResource::ReturnResources(
1832 frame.delegated_frame_data->resource_list, &resources);
1833 }
1834 SendReclaimCompositorResources(routing_id_, compositor_frame_sink_id, 1831 SendReclaimCompositorResources(routing_id_, compositor_frame_sink_id,
1835 process_->GetID(), true /* is_swap_ack */, 1832 process_->GetID(), true /* is_swap_ack */,
1836 resources); 1833 resources);
1837 } 1834 }
1838 1835
1839 RenderProcessHost* rph = GetProcess(); 1836 RenderProcessHost* rph = GetProcess();
1840 for (std::vector<IPC::Message>::const_iterator i = 1837 for (std::vector<IPC::Message>::const_iterator i =
1841 messages_to_deliver_with_frame.begin(); 1838 messages_to_deliver_with_frame.begin();
1842 i != messages_to_deliver_with_frame.end(); 1839 i != messages_to_deliver_with_frame.end();
1843 ++i) { 1840 ++i) {
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
2501 // Note: We are using the origin URL provided by the sender here. It may be 2498 // Note: We are using the origin URL provided by the sender here. It may be
2502 // different from the receiver's. 2499 // different from the receiver's.
2503 file_system_file.url = 2500 file_system_file.url =
2504 GURL(storage::GetIsolatedFileSystemRootURIString( 2501 GURL(storage::GetIsolatedFileSystemRootURIString(
2505 file_system_url.origin(), filesystem_id, std::string()) 2502 file_system_url.origin(), filesystem_id, std::string())
2506 .append(register_name)); 2503 .append(register_name));
2507 } 2504 }
2508 } 2505 }
2509 2506
2510 } // namespace content 2507 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698