Allow CopyFromBackingStore to fallback to copying from the renderer side if the accelerated surface…

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 44006f1f5ce0f655b41096ef6b8eeae7d48f5090..bff40735d2a52c95725c1f3ebb5fb6a3d09e3379 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -644,15 +644,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
     prefs.accelerated_compositing_enabled = false;
   }
 
-#if defined(OS_LINUX) && !defined(USE_AURA)
-  // Temporary fix for Linux non-Aura capturing. http://crbug.com/174957
-  WebContentsImpl* web_contents =
-      static_cast<WebContentsImpl*>(WebContents::FromRenderViewHost(rvh));
-  if (web_contents && web_contents->capturer_count_ > 0) {
-    prefs.accelerated_compositing_enabled = false;
-  }
-#endif
-
   return prefs;
 }
 
@@ -998,16 +989,6 @@ void WebContentsImpl::IncrementCapturerCount() {
   ++capturer_count_;
   DVLOG(1) << "There are now " << capturer_count_
            << " capturing(s) of WebContentsImpl@" << this;
-
-#if defined(OS_LINUX) && !defined(USE_AURA)
-  // Temporary fix for Linux non-Aura capturing. http://crbug.com/174957
-  if (capturer_count_ == 1) {
-    // Force a WebkitPreferences reload to disable compositing for snapshots.
-    RenderViewHost* rvh = GetRenderViewHost();
-    if (rvh)
-      rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences());
-  }
-#endif
 }
 
 void WebContentsImpl::DecrementCapturerCount() {
@@ -1019,16 +1000,6 @@ void WebContentsImpl::DecrementCapturerCount() {
   if (is_being_destroyed_)
     return;
 
-#if defined(OS_LINUX) && !defined(USE_AURA)
-  // Temporary fix for Linux non-Aura capturing. http://crbug.com/174957
-  if (capturer_count_ == 0) {
-    // Force a WebkitPreferences reload to re-enable compositing.
-    RenderViewHost* rvh = GetRenderViewHost();
-    if (rvh)
-      rvh->UpdateWebkitPreferences(rvh->GetWebkitPreferences());
-  }
-#endif
-
   // While capturer_count_ was greater than zero, the WasHidden() calls to RWHV
   // were being prevented.  If there are no more capturers, make the call now.
   if (capturer_count_ == 0 && !should_normally_be_visible_) {