diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 04:05:36 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 04:05:36 +0000 |
| commit | 0fc0a2d41dd50576479bf45ceb54c8b292f3cd70 (patch) | |
| tree | c33a7a388e8e41cfc838b66175a635f6ec85e3f1 /content/app | |
| parent | f54b991ac210e0200cde3173b0afb837901ed355 (diff) | |
| download | chromium_src-0fc0a2d41dd50576479bf45ceb54c8b292f3cd70.zip chromium_src-0fc0a2d41dd50576479bf45ceb54c8b292f3cd70.tar.gz chromium_src-0fc0a2d41dd50576479bf45ceb54c8b292f3cd70.tar.bz2 | |
[Android] Rename SurfaceTextureBridge to just SurfaceTexture.
This came up in https://codereview.chromium.org/22912020/ but was punted
to keep merging smaller. Now that it's in, here's the change. The java
class has a slightly different name as internally to the native
SurfaceTexture object we have a wrapper, but that detail is unknown to
clients.
Review URL: https://chromiumcodereview.appspot.com/23574003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/android/child_process_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc index 88de2ad..4d5de1d 100644 --- a/content/app/android/child_process_service.cc +++ b/content/app/android/child_process_service.cc @@ -45,13 +45,13 @@ class SurfaceTexturePeerChildImpl : public content::SurfaceTexturePeer, virtual void EstablishSurfaceTexturePeer( base::ProcessHandle pid, - scoped_refptr<gfx::SurfaceTextureBridge> surface_texture_bridge, + scoped_refptr<gfx::SurfaceTexture> surface_texture, int primary_id, int secondary_id) OVERRIDE { JNIEnv* env = base::android::AttachCurrentThread(); content::Java_ChildProcessService_establishSurfaceTexturePeer( env, service_.obj(), pid, - surface_texture_bridge->j_surface_texture().obj(), primary_id, + surface_texture->j_surface_texture().obj(), primary_id, secondary_id); CheckException(env); } |