summaryrefslogtreecommitdiffstats
path: root/cc/test/test_web_graphics_context_3d.h
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 17:23:01 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-23 17:23:01 +0000
commit7c7be99cfae41bdab15200d32ee7c6cb683f44b8 (patch)
treefc0247ff5792929afa170fbd709b24a636cf1d7c /cc/test/test_web_graphics_context_3d.h
parent47822260423f1b6195260dc06ce1a96e5daf291c (diff)
downloadchromium_src-7c7be99cfae41bdab15200d32ee7c6cb683f44b8.zip
chromium_src-7c7be99cfae41bdab15200d32ee7c6cb683f44b8.tar.gz
chromium_src-7c7be99cfae41bdab15200d32ee7c6cb683f44b8.tar.bz2
cc: Don't change the LayerTreeSettings impl painting sizes.
The values in LayerTreeSettings should be considered as consts, and we should not change them when the renderer changes. Instead, we should derive values from the settings and the renderer capabilities as appropriate. The impl painting settings for default_tile_size and max_untiled_layer_size are changed in this CL to not be modified in the layer tree settings, but instead be clamped to the renderer's max texture size in picture layer impl. Unit tests verify that when the renderer changes, the new max texture size is honoured. Tests: PictureLayerImplTest.ClampTilesToToMaxTileSize PictureLayerImplTest.ClampSingleTileToToMaxTileSize R=enne BUG=234233 Review URL: https://chromiumcodereview.appspot.com/14340010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d.h')
-rw-r--r--cc/test/test_web_graphics_context_3d.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 82dd63e..c7a92a5 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -89,6 +89,10 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
WebKit::WGC3Denum pname,
WebKit::WGC3Duint* params);
+ virtual void getIntegerv(
+ WebKit::WGC3Denum pname,
+ WebKit::WGC3Dint* value);
+
virtual void genMailboxCHROMIUM(WebKit::WGC3Dbyte* mailbox);
virtual void produceTextureCHROMIUM(WebKit::WGC3Denum target,
const WebKit::WGC3Dbyte* mailbox) { }
@@ -133,6 +137,8 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
shared_contexts_.push_back(context3d);
}
+ void set_max_texture_size(int size) { max_texture_size_ = size; }
+
static const WebKit::WebGLId kExternalTextureId;
virtual WebKit::WebGLId NextTextureId();
@@ -154,6 +160,7 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
std::vector<WebKit::WebGLId> textures_;
base::hash_set<WebKit::WebGLId> used_textures_;
std::vector<WebKit::WebGraphicsContext3D*> shared_contexts_;
+ int max_texture_size_;
int width_;
int height_;
};