diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 08:09:35 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 08:09:35 +0000 |
| commit | 061b2b31085552dd6aad065eb706b92804c5bf7a (patch) | |
| tree | b57baaa92b3c955b293302fdd5607d0133bb1c31 /content/shell/shell.cc | |
| parent | 878412f29e4b9fcff06fd9102174f9e473995b93 (diff) | |
| download | chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.zip chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.tar.gz chromium_src-061b2b31085552dd6aad065eb706b92804c5bf7a.tar.bz2 | |
Making it easier to hook a ContentViewCore to the SurfaceView.
This CL changes the way we deal with WebLayers, so that a ContentViewCore does
not need native code anymore to hook with the surface view.
The ContentViewCore now keeps track of the WebLayers as they are
attached/detached. The ContentViewRenderView is used to render a specific
ContentView by retrieving the ContentViewCore WebLlayer and adding it to the
compositor.
BUG=
TEST=ContentShell and ChromiumTestShell should still work.
Review URL: https://chromiumcodereview.appspot.com/11293264
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168166 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell.cc')
| -rw-r--r-- | content/shell/shell.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/shell/shell.cc b/content/shell/shell.cc index e85d976..48f462d 100644 --- a/content/shell/shell.cc +++ b/content/shell/shell.cc @@ -45,8 +45,6 @@ Shell::Shell(WebContents* web_contents) url_edit_view_(NULL) #if defined(OS_WIN) && !defined(USE_AURA) , default_edit_wnd_proc_(0) -#elif defined(OS_ANDROID) - , content_view_layer_renderer_(NULL) #endif { registrar_.Add(this, NOTIFICATION_WEB_CONTENTS_TITLE_UPDATED, |