summaryrefslogtreecommitdiffstats
path: root/cc/resources/shared_bitmap.h
diff options
context:
space:
mode:
authorjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 18:50:28 +0000
committerjbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 18:50:28 +0000
commit7407ad6a55334063610f5cca5bfb225085c2586c (patch)
treecbe450026a2b240b9bb30ebd081971ae1cae8c1b /cc/resources/shared_bitmap.h
parentb999632dd3e2070d872cd0546fab7b6ea8e319a8 (diff)
downloadchromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.zip
chromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.tar.gz
chromium_src-7407ad6a55334063610f5cca5bfb225085c2586c.tar.bz2
Revert 256955 "Add shared bitmap managers for browser and render..."
Seems to be causing renderer crashes and possibly out-of-memory issues. > Add shared bitmap managers for browser and renderer processes. > > The shared bitmap managers will allow software tiles to be allocated in shared memory, so delegated rendering could be used with them. > > BUG=327220 > R=danakj@chromium.org, jschuh@chromium.org, piman@chromium.org > > Review URL: https://codereview.chromium.org/148243013 TBR=jbauman@chromium.org BUG=352689,352616,352618 Review URL: https://codereview.chromium.org/197703004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257161 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/resources/shared_bitmap.h')
-rw-r--r--cc/resources/shared_bitmap.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/cc/resources/shared_bitmap.h b/cc/resources/shared_bitmap.h
index d62ffcc..9575068 100644
--- a/cc/resources/shared_bitmap.h
+++ b/cc/resources/shared_bitmap.h
@@ -10,7 +10,6 @@
#include "base/memory/shared_memory.h"
#include "cc/base/cc_export.h"
#include "gpu/command_buffer/common/mailbox.h"
-#include "ui/gfx/size.h"
namespace base { class SharedMemory; }
@@ -39,11 +38,6 @@ class CC_EXPORT SharedBitmap {
SharedBitmapId id() { return id_; }
- // Returns true if the size is valid and false otherwise.
- static bool GetSizeInBytes(const gfx::Size& size, size_t* size_in_bytes);
-
- static SharedBitmapId GenerateId();
-
private:
base::SharedMemory* memory_;
SharedBitmapId id_;