Revert 234928 "Use software compositor for windows under 64 pixe..."

This broke extension popups.

> Use software compositor for windows under 64 pixels wide or tall.
> 
> They're broken on AMD drivers. Switch back and forth between software and hardware using lost device on the output surface on resize.
> 
> BUG=286609
> R=jamesr@chromium.org
> 
> Review URL: https://codereview.chromium.org/61323003

TBR=jbauman@chromium.org
BUG=286609,319644,312277

Review URL: https://codereview.chromium.org/73723004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235409 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 3 insertions, 16 deletions

diff --git a/cc/output/output_surface.cc b/cc/output/output_surface.cc
index 9820ee28..749527e 100644
--- a/cc/output/output_surface.cc
+++ b/cc/output/output_surface.cc
@@ -55,8 +55,7 @@ OutputSurface::OutputSurface(scoped_refptr<ContextProvider> context_provider)
       check_for_retroactive_begin_impl_frame_pending_(false),
       external_stencil_test_enabled_(false),
       weak_ptr_factory_(this),
-      gpu_latency_history_(kGpuLatencyHistorySize),
-      is_lost_(false) {}
+      gpu_latency_history_(kGpuLatencyHistorySize) {}
 
 OutputSurface::OutputSurface(
     scoped_ptr<cc::SoftwareOutputDevice> software_device)
@@ -72,8 +71,7 @@ OutputSurface::OutputSurface(
       check_for_retroactive_begin_impl_frame_pending_(false),
       external_stencil_test_enabled_(false),
       weak_ptr_factory_(this),
-      gpu_latency_history_(kGpuLatencyHistorySize),
-      is_lost_(false) {}
+      gpu_latency_history_(kGpuLatencyHistorySize) {}
 
 OutputSurface::OutputSurface(
     scoped_refptr<ContextProvider> context_provider,
@@ -91,8 +89,7 @@ OutputSurface::OutputSurface(
       check_for_retroactive_begin_impl_frame_pending_(false),
       external_stencil_test_enabled_(false),
       weak_ptr_factory_(this),
-      gpu_latency_history_(kGpuLatencyHistorySize),
-      is_lost_(false) {}
+      gpu_latency_history_(kGpuLatencyHistorySize) {}
 
 void OutputSurface::InitializeBeginImplFrameEmulation(
     base::SingleThreadTaskRunner* task_runner,
@@ -245,11 +242,8 @@ void OutputSurface::DidLoseOutputSurface() {
   pending_gpu_latency_query_ids_.clear();
   available_gpu_latency_query_ids_.clear();
   client_->DidLoseOutputSurface();
-  is_lost_ = true;
 }
 
-bool OutputSurface::IsLost() { return is_lost_; }
-
 void OutputSurface::SetExternalStencilTest(bool enabled) {
   external_stencil_test_enabled_ = enabled;
 }
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 7cafbd9..efe0ea2 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -139,9 +139,6 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   // device is present, returns 0.
   base::TimeDelta GpuLatencyEstimate();
 
-  // Has the output surface been lost.
-  bool IsLost();
-
  protected:
   // Synchronously initialize context3d and enter hardware mode.
   // This can only supported in threaded compositing mode.
@@ -217,8 +214,6 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   std::deque<unsigned> pending_gpu_latency_query_ids_;
   RollingTimeDeltaHistory gpu_latency_history_;
 
-  bool is_lost_;
-
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };
 
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 0af1036..53afea7 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -1392,8 +1392,6 @@ void LayerTreeHostImpl::FinishAllRendering() {
 
 bool LayerTreeHostImpl::IsContextLost() {
   DCHECK(proxy_->IsImplThread());
-  if (output_surface_ && output_surface_->IsLost())
-    return true;
   return renderer_ && renderer_->IsContextLost();
 }