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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10828356: Very basic Android browser-side compositing support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments, rebase Created 8 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 | Annotate | Revision Log
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/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 1422 matching lines...) Expand 10 before | Expand all | Expand 10 after
1433 1433
1434 void WebContentsImpl::RequestMediaAccessPermission( 1434 void WebContentsImpl::RequestMediaAccessPermission(
1435 const content::MediaStreamRequest* request, 1435 const content::MediaStreamRequest* request,
1436 const content::MediaResponseCallback& callback) { 1436 const content::MediaResponseCallback& callback) {
1437 if (delegate_) 1437 if (delegate_)
1438 delegate_->RequestMediaAccessPermission(this, request, callback); 1438 delegate_->RequestMediaAccessPermission(this, request, callback);
1439 else 1439 else
1440 callback.Run(content::MediaStreamDevices()); 1440 callback.Run(content::MediaStreamDevices());
1441 } 1441 }
1442 1442
1443 void WebContentsImpl::AttachLayer(WebKit::WebLayer& layer) {
1444 if (delegate_)
1445 delegate_->AttachLayer(this, layer);
1446 }
1447
1448 void WebContentsImpl::RemoveLayer(WebKit::WebLayer& layer) {
1449 if (delegate_)
1450 delegate_->RemoveLayer(this, layer);
1451 }
1452
1443 void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) { 1453 void WebContentsImpl::UpdatePreferredSize(const gfx::Size& pref_size) {
1444 preferred_size_ = pref_size; 1454 preferred_size_ = pref_size;
1445 if (delegate_) 1455 if (delegate_)
1446 delegate_->UpdatePreferredSize(this, pref_size); 1456 delegate_->UpdatePreferredSize(this, pref_size);
1447 } 1457 }
1448 1458
1449 void WebContentsImpl::ResizeDueToAutoResize(const gfx::Size& new_size) { 1459 void WebContentsImpl::ResizeDueToAutoResize(const gfx::Size& new_size) {
1450 if (delegate_) 1460 if (delegate_)
1451 delegate_->ResizeDueToAutoResize(this, new_size); 1461 delegate_->ResizeDueToAutoResize(this, new_size);
1452 } 1462 }
(...skipping 1758 matching lines...) Expand 10 before | Expand all | Expand 10 after
3211 old_browser_plugin_host()->embedder_render_process_host(); 3221 old_browser_plugin_host()->embedder_render_process_host();
3212 *embedder_container_id = old_browser_plugin_host()->instance_id(); 3222 *embedder_container_id = old_browser_plugin_host()->instance_id();
3213 int embedder_process_id = 3223 int embedder_process_id =
3214 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; 3224 embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
3215 if (embedder_process_id != -1) { 3225 if (embedder_process_id != -1) {
3216 *embedder_channel_name = 3226 *embedder_channel_name =
3217 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), 3227 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
3218 embedder_process_id); 3228 embedder_process_id);
3219 } 3229 }
3220 } 3230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698