Consolidate UpdateFrameInfo and SwapCompositorFrame.

content/browser/android/content_view_core_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <vector>
 
 #include "base/android/jni_helper.h"
@@ skipping 195 matching lines @@
                               bool enable_showing,
                               bool animate);
   void ShowImeIfNeeded(JNIEnv* env, jobject obj);
 
   void ShowInterstitialPage(JNIEnv* env,
                             jobject obj,
                             jstring jurl,
                             jint delegate);
   jboolean IsShowingInterstitialPage(JNIEnv* env, jobject obj);
 
-  jboolean ConsumePendingRendererFrame(JNIEnv* env, jobject obj);
-
   void AttachExternalVideoSurface(JNIEnv* env,
                                   jobject obj,
                                   jint player_id,
                                   jobject jsurface);
   void DetachExternalVideoSurface(JNIEnv* env, jobject obj, jint player_id);
 
   // --------------------------------------------------------------------------
   // Public methods that call to Java via JNI
   // --------------------------------------------------------------------------
 
@@ skipping 49 matching lines @@
 
   gfx::Size GetPhysicalBackingSize() const;
   gfx::Size GetViewportSizeDip() const;
   gfx::Size GetViewportSizeOffsetDip() const;
   float GetOverdrawBottomHeightDip() const;
 
   InputEventAckState FilterInputEvent(const WebKit::WebInputEvent& input_event);
 
   void AttachLayer(scoped_refptr<cc::Layer> layer);
   void RemoveLayer(scoped_refptr<cc::Layer> layer);
-  void DidProduceRendererFrame();
 
  private:
   class ContentViewUserData;
 
   friend class ContentViewUserData;
   virtual ~ContentViewCoreImpl();
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
@@ skipping 33 matching lines @@
 
   // A compositor layer containing any layer that should be shown.
   scoped_refptr<cc::Layer> root_layer_;
 
   // Whether the renderer backing this ContentViewCore has crashed.
   bool tab_crashed_;
 
   // Whether input events will be consistently delivered at vsync time.
   bool input_events_delivered_at_vsync_;
 
-  // Whether a new frame from the renderer is waiting to be displayed by the
-  // browser compositor.
-  bool renderer_frame_pending_;
-
   // Device scale factor.
   float dpi_scale_;
 
   // The owning window that has a hold of main application activity.
   ui::WindowAndroid* window_android_;
 
   std::vector<UpdateFrameInfoCallback> update_frame_info_callbacks_;
 
   // Optional browser-side input event filtering.
   scoped_ptr<SyncInputEventFilter> input_event_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_