ContentShell rendering support on Android.

content/shell/android/java/src/org/chromium/content_shell/Shell.java

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content_shell;
 
 import android.content.Context;
 import android.graphics.drawable.ClipDrawable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
@@ skipping 28 matching lines @@
     };
 
     // TODO(jrg): a mContentView.destroy() call is needed, both upstream and downstream.
     private ContentView mContentView;
     private EditText mUrlTextView;
     private ImageButton mPrevButton;
     private ImageButton mNextButton;
 
     private ClipDrawable mProgressDrawable;
 
+    private View mSurfaceView;
+
     /**
      * Constructor for inflating via XML.
      */
     public Shell(Context context, AttributeSet attrs) {
         super(context, attrs);
     }
 
+    public void setSurfaceView(View surfaceView) {

[Ted C, 2012/07/27 20:31:15]

javadoc for these public methods...even if it simply says they are temporary.

[no sievers, 2012/07/31 01:28:44]

Done.

+        mSurfaceView = surfaceView;
+        ((FrameLayout) findViewById(R.id.contentview_holder)).addView(mSurfaceView,
+                new FrameLayout.LayoutParams(
+                        FrameLayout.LayoutParams.MATCH_PARENT,
+                        FrameLayout.LayoutParams.MATCH_PARENT));
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
 
         mProgressDrawable = (ClipDrawable) findViewById(R.id.toolbar).getBackground();
 
-        initilizeUrlField();

[klobag.chromium, 2012/07/27 19:42:22]

I don't think we need to move this line as it just sets up the EditTextView. I
think you want to defer any call to loadUrl until the first onSurfaceCreated is
called to ensure the main context is created.

[no sievers, 2012/07/31 01:28:44]

Done.

         initializeNavigationButtons();
     }
 
-    private void initilizeUrlField() {
+    public void onSurfaceCreated() {
+        initializeUrlField();
+        loadUrl("http://www.google.com");

[Satish, 2012/07/27 09:49:24]

is this required or was it test code to be removed?

[klobag.chromium, 2012/07/27 19:42:22]

You may not want to do it for every onSurfaceCreated(), only the first
onSurfaceCreated() to indicate the app is ready.

[Ted C, 2012/07/27 20:31:15]

loadUrl happens as part of shell creation during startup, is the extra required?
 Can we just call reload?

[no sievers, 2012/07/31 01:28:44]

Required for now since we have to create the UI graphics context first (which
needs the surface) before we can create a renderer. (There currently is a
dependency between compositor and UI context for texture image transport).

On 2012/07/27 09:49:24, Satish wrote:

+    }
+
+    private void initializeUrlField() {
         mUrlTextView = (EditText) findViewById(R.id.url);
         mUrlTextView.setOnEditorActionListener(new OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
                 if ((actionId != EditorInfo.IME_ACTION_GO) && (event == null ||
                         event.getKeyCode() != KeyEvent.KEYCODE_ENTER ||
                         event.getAction() != KeyEvent.ACTION_UP)) {
                     return false;
                 }
                 loadUrl(mUrlTextView.getText().toString());
@@ skipping 101 matching lines @@
     private void setKeyboardVisibilityForUrl(boolean visible) {
         InputMethodManager imm = (InputMethodManager) getContext().getSystemService(
                 Context.INPUT_METHOD_SERVICE);
         if (visible) {
             imm.showSoftInput(mUrlTextView, InputMethodManager.SHOW_IMPLICIT);
         } else {
             imm.hideSoftInputFromWindow(mUrlTextView.getWindowToken(), 0);
         }
     }
 }