Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(565)

Unified Diff: trunk/src/content/browser/renderer_host/compositor_impl_android.h

Issue 23740010: Revert 223162 "Update the nine patch layer to use UI resources" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/content/browser/renderer_host/compositor_impl_android.h
===================================================================
--- trunk/src/content/browser/renderer_host/compositor_impl_android.h (revision 223178)
+++ trunk/src/content/browser/renderer_host/compositor_impl_android.h (working copy)
@@ -7,10 +7,8 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "base/containers/scoped_ptr_hash_map.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "cc/resources/ui_resource_client.h"
#include "cc/trees/layer_tree_host_client.h"
#include "content/browser/renderer_host/image_transport_factory_android.h"
#include "content/common/content_export.h"
@@ -23,7 +21,6 @@
class InputHandlerClient;
class Layer;
class LayerTreeHost;
-class ScopedUIResource;
}
namespace content {
@@ -63,9 +60,6 @@
void *pixels, const gfx::Rect& rect) OVERRIDE;
virtual void SetNeedsRedraw() OVERRIDE;
virtual void Composite() OVERRIDE;
- virtual cc::UIResourceId GenerateUIResource(
- const cc::UIResourceBitmap& bitmap) OVERRIDE;
- virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;
virtual WebKit::WebGLId GenerateTexture(gfx::JavaBitmap& bitmap) OVERRIDE;
virtual WebKit::WebGLId GenerateCompressedTexture(
gfx::Size& size, int data_size, void* data) OVERRIDE;
@@ -123,10 +117,6 @@
scoped_refptr<cc::ContextProvider> null_offscreen_context_provider_;
- typedef base::ScopedPtrHashMap<cc::UIResourceId, cc::ScopedUIResource>
- UIResourceMap;
- UIResourceMap ui_resource_map_;
-
DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
};
« no previous file with comments | « trunk/src/cc/trees/layer_tree_impl.cc ('k') | trunk/src/content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698