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

Side by Side Diff: content/browser/android/synchronous_compositor_host.cc

Issue 1469773002: sync compositor: Software draw (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: safe_math Created 5 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/synchronous_compositor_host.h" 5 #include "content/browser/android/synchronous_compositor_host.h"
6 6
7 #include "base/containers/hash_tables.h" 7 #include "base/containers/hash_tables.h"
8 #include "base/memory/shared_memory.h"
9 #include "base/trace_event/trace_event_argument.h"
8 #include "cc/output/compositor_frame_ack.h" 10 #include "cc/output/compositor_frame_ack.h"
9 #include "content/browser/renderer_host/render_widget_host_view_android.h" 11 #include "content/browser/renderer_host/render_widget_host_view_android.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 12 #include "content/browser/web_contents/web_contents_impl.h"
11 #include "content/common/android/sync_compositor_messages.h" 13 #include "content/common/android/sync_compositor_messages.h"
12 #include "content/public/browser/android/synchronous_compositor_client.h" 14 #include "content/public/browser/android/synchronous_compositor_client.h"
13 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
14 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
15 #include "ipc/ipc_sender.h" 17 #include "ipc/ipc_sender.h"
18 #include "third_party/skia/include/core/SkBitmap.h"
19 #include "third_party/skia/include/core/SkCanvas.h"
20 #include "third_party/skia/include/core/SkImageInfo.h"
21 #include "third_party/skia/include/core/SkRect.h"
22 #include "ui/gfx/skia_util.h"
16 23
17 namespace content { 24 namespace content {
18 25
19 SynchronousCompositorHost::SynchronousCompositorHost( 26 SynchronousCompositorHost::SynchronousCompositorHost(
20 RenderWidgetHostViewAndroid* rwhva, 27 RenderWidgetHostViewAndroid* rwhva,
21 SynchronousCompositorClient* client) 28 SynchronousCompositorClient* client)
22 : rwhva_(rwhva), 29 : rwhva_(rwhva),
23 client_(client), 30 client_(client),
24 ui_task_runner_( 31 ui_task_runner_(
25 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)), 32 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI)),
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 UpdateFrameMetaData(frame->metadata); 85 UpdateFrameMetaData(frame->metadata);
79 return frame; 86 return frame;
80 } 87 }
81 88
82 void SynchronousCompositorHost::UpdateFrameMetaData( 89 void SynchronousCompositorHost::UpdateFrameMetaData(
83 const cc::CompositorFrameMetadata& frame_metadata) { 90 const cc::CompositorFrameMetadata& frame_metadata) {
84 rwhva_->SynchronousFrameMetadata(frame_metadata); 91 rwhva_->SynchronousFrameMetadata(frame_metadata);
85 } 92 }
86 93
87 bool SynchronousCompositorHost::DemandDrawSw(SkCanvas* canvas) { 94 bool SynchronousCompositorHost::DemandDrawSw(SkCanvas* canvas) {
88 // TODO(boliu): Implement. 95 SyncCompositorDemandDrawSwParams params;
89 return false; 96 params.size = gfx::Size(canvas->getDeviceSize().width(),
97 canvas->getDeviceSize().height());
no sievers 2015/11/24 23:38:40 nit: indent
boliu 2015/11/25 00:00:13 Done. Also use getBaseLayerSize since getDeviceSiz
98 SkIRect canvas_clip;
99 canvas->getClipDeviceBounds(&canvas_clip);
100 params.clip = gfx::SkIRectToRect(canvas_clip);
101 params.transform.matrix() = canvas->getTotalMatrix();
102
103 size_t buffer_size = params.size.width() * params.size.height() * 4;
no sievers 2015/11/24 23:38:40 nit: dcheck the pixel format?
boliu 2015/11/25 00:00:13 Fun fact. The canvas passed in does has kUnknown_S
104 base::SharedMemory shm;
105 {
106 TRACE_EVENT1("browser", "AllocateSharedMemory", "buffer_size", buffer_size);
107 if (!shm.CreateAndMapAnonymous(buffer_size))
108 return false;
109 }
110 base::ProcessHandle renderer_process_handle =
no sievers 2015/11/24 23:38:39 no recycling? is this only supposed to be for once
boliu 2015/11/25 00:00:13 No. But that optimization can come later. It's som
111 rwhva_->GetRenderWidgetHost()->GetProcess()->GetHandle();
112 if (!shm.ShareToProcess(renderer_process_handle, &params.shm_handle))
113 return false;
114
115 scoped_ptr<cc::CompositorFrame> frame(new cc::CompositorFrame);
116 SyncCompositorCommonBrowserParams common_browser_params;
117 PopulateCommonParams(&common_browser_params);
118 SyncCompositorCommonRendererParams common_renderer_params;
119 bool success = false;
120 if (!sender_->Send(new SyncCompositorMsg_DemandDrawSw(
121 routing_id_, common_browser_params, params, &success,
122 &common_renderer_params, frame.get()))) {
123 return false;
124 }
125 if (!success)
126 return false;
127
128 ProcessCommonParams(common_renderer_params);
129 UpdateFrameMetaData(frame->metadata);
130
131 SkImageInfo info =
132 SkImageInfo::MakeN32Premul(params.size.width(), params.size.height());
133 SkBitmap bitmap;
134 if (!bitmap.installPixels(info, shm.memory(), params.size.width() * 4))
135 return false;
136
137 {
138 TRACE_EVENT0("browser", "DrawBitmap");
139 canvas->save();
140 canvas->resetMatrix();
141 canvas->drawBitmap(bitmap, 0, 0);
142 canvas->restore();
143 }
144
145 return true;
90 } 146 }
91 147
92 void SynchronousCompositorHost::ReturnResources( 148 void SynchronousCompositorHost::ReturnResources(
93 const cc::CompositorFrameAck& frame_ack) { 149 const cc::CompositorFrameAck& frame_ack) {
94 returned_resources_.insert(returned_resources_.end(), 150 returned_resources_.insert(returned_resources_.end(),
95 frame_ack.resources.begin(), 151 frame_ack.resources.begin(),
96 frame_ack.resources.end()); 152 frame_ack.resources.end());
97 } 153 }
98 154
99 void SynchronousCompositorHost::SetMemoryPolicy(size_t bytes_limit) { 155 void SynchronousCompositorHost::SetMemoryPolicy(size_t bytes_limit) {
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 params.scrollable_size, params.page_scale_factor, 293 params.scrollable_size, params.page_scale_factor,
238 params.min_page_scale_factor, params.max_page_scale_factor); 294 params.min_page_scale_factor, params.max_page_scale_factor);
239 } 295 }
240 } 296 }
241 297
242 void SynchronousCompositorHost::UpdateNeedsBeginFrames() { 298 void SynchronousCompositorHost::UpdateNeedsBeginFrames() {
243 rwhva_->OnSetNeedsBeginFrames(is_active_ && need_begin_frame_); 299 rwhva_->OnSetNeedsBeginFrames(is_active_ && need_begin_frame_);
244 } 300 }
245 301
246 } // namespace content 302 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698