5 files changed, 0 insertions, 105 deletions
diff --git a/android_webview/common/aw_switches.cc b/android_webview/common/aw_switches.cc
index e526eb92..a24b123 100644
--- a/android_webview/common/aw_switches.cc
+++ b/android_webview/common/aw_switches.cc
@@ -8,9 +8,6 @@ namespace switches {
 
 const char kDisableSimpleCache[] = "disable-simple-cache";
 
-const char kNoMergeUIAndRendererCompositorThreads[] =
-    "no-merge-ui-and-compositor-threads";
-
 const char kUseZeroCopyBuffers[] = "use-zero-copy-buffers";
 
 }  // namespace switches
diff --git a/android_webview/common/aw_switches.h b/android_webview/common/aw_switches.h
index a627a41..f5ef4b2 100644
--- a/android_webview/common/aw_switches.h
+++ b/android_webview/common/aw_switches.h
@@ -10,9 +10,6 @@ namespace switches {
 // When set, falls back to using the old disk cache.
 extern const char kDisableSimpleCache[];
 
-// Do not merge the Browser UI and the renderer compositor threads.
-extern const char kNoMergeUIAndRendererCompositorThreads[];
-
 // Uses zero-copy buffers in graphics pipeline.
 extern const char kUseZeroCopyBuffers[];
 
diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h
index 96e8c00..68ce3bc 100644
--- a/android_webview/common/render_view_messages.h
+++ b/android_webview/common/render_view_messages.h
@@ -51,14 +51,6 @@ IPC_MESSAGE_ROUTED2(AwViewMsg_DoHitTest,
                     int /* view_x */,
                     int /* view_y */)
 
-// Enables receiving pictures from the renderer on every new frame.
-IPC_MESSAGE_ROUTED1(AwViewMsg_EnableCapturePictureCallback,
-                    bool /* enable */)
-
-// Requests a new picture with the latest renderer contents synchronously.
-// This message blocks the browser process on the renderer until complete.
-IPC_SYNC_MESSAGE_ROUTED0_0(AwViewMsg_CapturePictureSync)
-
 // Sets the zoom level for text only. Used in layout modes other than
 // Text Autosizing.
 IPC_MESSAGE_ROUTED1(AwViewMsg_SetTextZoomLevel,
@@ -91,7 +83,3 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_UpdateHitTestData,
 IPC_MESSAGE_ROUTED1(AwViewHostMsg_PageScaleFactorChanged,
                     float /* page_scale_factor */)
 
-// Notification that a new picture becomes available. It is only sent if
-// AwViewMsg_EnableCapturePictureCallback was previously enabled.
-IPC_MESSAGE_ROUTED0(AwViewHostMsg_PictureUpdated)
-
diff --git a/android_webview/common/renderer_picture_map.cc b/android_webview/common/renderer_picture_map.cc
deleted file mode 100644
index c27cc56..0000000
--- a/android_webview/common/renderer_picture_map.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.
-
-#include "android_webview/common/renderer_picture_map.h"
-
-#include "base/logging.h"
-
-using base::AutoLock;
-
-namespace android_webview {
-
-static RendererPictureMap* g_renderer_picture_map = NULL;
-
-// static
-void RendererPictureMap::CreateInstance() {
-  if (!g_renderer_picture_map)
-    g_renderer_picture_map = new RendererPictureMap();
-}
-
-// static
-RendererPictureMap* RendererPictureMap::GetInstance() {
-  DCHECK(g_renderer_picture_map);
-  return g_renderer_picture_map;
-}
-
-RendererPictureMap::RendererPictureMap() {
-}
-
-RendererPictureMap::~RendererPictureMap() {
-}
-
-skia::RefPtr<SkPicture> RendererPictureMap::GetRendererPicture(int id) {
-  AutoLock lock(lock_);
-  return picture_map_[id];
-}
-
-void RendererPictureMap::SetRendererPicture(int id,
-    skia::RefPtr<SkPicture> picture) {
-  AutoLock lock(lock_);
-  picture_map_[id] = picture;
-}
-
-void RendererPictureMap::ClearRendererPicture(int id) {
-  AutoLock lock(lock_);
-  picture_map_.erase(id);
-}
-
-}  // android_webview
diff --git a/android_webview/common/renderer_picture_map.h b/android_webview/common/renderer_picture_map.h
deleted file mode 100644
index 5e0229d..0000000
--- a/android_webview/common/renderer_picture_map.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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 ANDROID_WEBVIEW_COMMON_RENDERER_PICTURE_MAP_H_
-#define ANDROID_WEBVIEW_COMMON_RENDERER_PICTURE_MAP_H_
-
-#include <map>
-
-#include "base/synchronization/lock.h"
-#include "skia/ext/refptr.h"
-#include "third_party/skia/include/core/SkPicture.h"
-
-namespace android_webview {
-
-// Stores pictures received from diferent renderers and associates them by
-// renderer id. Will only work in single process mode.
-class RendererPictureMap {
- public:
-  static void CreateInstance();
-  static RendererPictureMap* GetInstance();
-
-  skia::RefPtr<SkPicture> GetRendererPicture(int id);
-  void SetRendererPicture(int id, skia::RefPtr<SkPicture> picture);
-  void ClearRendererPicture(int id);
-
- private:
-  RendererPictureMap();
-  ~RendererPictureMap();
-
-  typedef std::map<int, skia::RefPtr<SkPicture> > PictureMap;
-  PictureMap picture_map_;
-  base::Lock lock_;
-};
-
-}  // android_webview
-
-#endif  // ANDROID_WEBVIEW_COMMON_RENDERER_PICTURE_MAP_H_