diff options
Diffstat (limited to 'cc/test')
-rw-r--r-- | cc/test/fake_picture_layer_impl.cc | 2 | ||||
-rw-r--r-- | cc/test/fake_picture_layer_impl.h | 5 | ||||
-rw-r--r-- | cc/test/fake_picture_layer_tiling_client.cc | 4 | ||||
-rw-r--r-- | cc/test/fake_picture_layer_tiling_client.h | 4 | ||||
-rw-r--r-- | cc/test/fake_picture_pile_impl.cc | 12 | ||||
-rw-r--r-- | cc/test/fake_picture_pile_impl.h | 12 | ||||
-rw-r--r-- | cc/test/layer_tree_pixel_test.cc | 2 | ||||
-rw-r--r-- | cc/test/layer_tree_pixel_test.h | 2 | ||||
-rw-r--r-- | cc/test/pixel_test.cc | 2 | ||||
-rw-r--r-- | cc/test/pixel_test.h | 2 | ||||
-rw-r--r-- | cc/test/pixel_test_output_surface.cc | 3 | ||||
-rw-r--r-- | cc/test/pixel_test_output_surface.h | 4 | ||||
-rw-r--r-- | cc/test/pixel_test_software_output_device.cc | 2 | ||||
-rw-r--r-- | cc/test/pixel_test_software_output_device.h | 4 | ||||
-rw-r--r-- | cc/test/skia_common.cc | 2 | ||||
-rw-r--r-- | cc/test/skia_common.h | 2 | ||||
-rw-r--r-- | cc/test/test_texture.cc | 4 | ||||
-rw-r--r-- | cc/test/test_texture.h | 4 | ||||
-rw-r--r-- | cc/test/tiled_layer_test_common.cc | 4 | ||||
-rw-r--r-- | cc/test/tiled_layer_test_common.h | 4 |
20 files changed, 39 insertions, 41 deletions
diff --git a/cc/test/fake_picture_layer_impl.cc b/cc/test/fake_picture_layer_impl.cc index 4241ae0..6e9ffde 100644 --- a/cc/test/fake_picture_layer_impl.cc +++ b/cc/test/fake_picture_layer_impl.cc @@ -36,7 +36,7 @@ void FakePictureLayerImpl::AppendQuads(QuadSink* quad_sink, } gfx::Size FakePictureLayerImpl::CalculateTileSize( - const gfx::Size& content_bounds) const { + gfx::Size content_bounds) const { if (fixed_tile_size_.IsEmpty()) { return PictureLayerImpl::CalculateTileSize(content_bounds); } diff --git a/cc/test/fake_picture_layer_impl.h b/cc/test/fake_picture_layer_impl.h index 477b6b9..a289934 100644 --- a/cc/test/fake_picture_layer_impl.h +++ b/cc/test/fake_picture_layer_impl.h @@ -26,8 +26,7 @@ class FakePictureLayerImpl : public PictureLayerImpl { OVERRIDE; virtual void AppendQuads(QuadSink* quad_sink, AppendQuadsData* append_quads_data) OVERRIDE; - virtual gfx::Size CalculateTileSize( - const gfx::Size& content_bounds) const OVERRIDE; + virtual gfx::Size CalculateTileSize(gfx::Size content_bounds) const OVERRIDE; using PictureLayerImpl::AddTiling; using PictureLayerImpl::CleanUpTilingsOnActiveLayer; @@ -55,7 +54,7 @@ class FakePictureLayerImpl : public PictureLayerImpl { const Region& invalidation() const { return invalidation_; } void set_invalidation(const Region& region) { invalidation_ = region; } - void set_fixed_tile_size(const gfx::Size& size) { fixed_tile_size_ = size; } + void set_fixed_tile_size(gfx::Size size) { fixed_tile_size_ = size; } void CreateDefaultTilingsAndTiles(); void SetAllTilesVisible(); diff --git a/cc/test/fake_picture_layer_tiling_client.cc b/cc/test/fake_picture_layer_tiling_client.cc index f891b9e..acbd791 100644 --- a/cc/test/fake_picture_layer_tiling_client.cc +++ b/cc/test/fake_picture_layer_tiling_client.cc @@ -49,12 +49,12 @@ scoped_refptr<Tile> FakePictureLayerTilingClient::CreateTile( pile_.get(), tile_size_, rect, gfx::Rect(), 1, 0, 0, Tile::USE_LCD_TEXT); } -void FakePictureLayerTilingClient::SetTileSize(const gfx::Size& tile_size) { +void FakePictureLayerTilingClient::SetTileSize(gfx::Size tile_size) { tile_size_ = tile_size; } gfx::Size FakePictureLayerTilingClient::CalculateTileSize( - const gfx::Size& /* content_bounds */) const { + gfx::Size /* content_bounds */) const { return tile_size_; } diff --git a/cc/test/fake_picture_layer_tiling_client.h b/cc/test/fake_picture_layer_tiling_client.h index 6383a22..2e4e9d6 100644 --- a/cc/test/fake_picture_layer_tiling_client.h +++ b/cc/test/fake_picture_layer_tiling_client.h @@ -25,9 +25,9 @@ class FakePictureLayerTilingClient : public PictureLayerTilingClient { PictureLayerTiling* tiling, const gfx::Rect& rect) OVERRIDE; virtual void UpdatePile(Tile* tile) OVERRIDE {} virtual gfx::Size CalculateTileSize( - const gfx::Size& content_bounds) const OVERRIDE; + gfx::Size content_bounds) const OVERRIDE; - void SetTileSize(const gfx::Size& tile_size); + void SetTileSize(gfx::Size tile_size); gfx::Size TileSize() const { return tile_size_; } scoped_refptr<PicturePileImpl> pile() { return pile_; } const PicturePileImpl* pile() const { return pile_.get(); } diff --git a/cc/test/fake_picture_pile_impl.cc b/cc/test/fake_picture_pile_impl.cc index 9b168e6..bc751ed 100644 --- a/cc/test/fake_picture_pile_impl.cc +++ b/cc/test/fake_picture_pile_impl.cc @@ -17,8 +17,8 @@ FakePicturePileImpl::FakePicturePileImpl() {} FakePicturePileImpl::~FakePicturePileImpl() {} scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds) { + gfx::Size tile_size, + gfx::Size layer_bounds) { scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl()); pile->tiling().SetTotalSize(layer_bounds); pile->tiling().SetMaxTextureSize(tile_size); @@ -32,8 +32,8 @@ scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateFilledPile( } scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateEmptyPile( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds) { + gfx::Size tile_size, + gfx::Size layer_bounds) { scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl()); pile->tiling().SetTotalSize(layer_bounds); pile->tiling().SetMaxTextureSize(tile_size); @@ -44,8 +44,8 @@ scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreateEmptyPile( scoped_refptr<FakePicturePileImpl> FakePicturePileImpl::CreatePileWithRecordedRegion( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds, + gfx::Size tile_size, + gfx::Size layer_bounds, const Region& recorded_region) { scoped_refptr<FakePicturePileImpl> pile(new FakePicturePileImpl()); pile->tiling().SetTotalSize(layer_bounds); diff --git a/cc/test/fake_picture_pile_impl.h b/cc/test/fake_picture_pile_impl.h index ae424bb..20d44e3 100644 --- a/cc/test/fake_picture_pile_impl.h +++ b/cc/test/fake_picture_pile_impl.h @@ -14,16 +14,16 @@ namespace cc { class FakePicturePileImpl : public PicturePileImpl { public: static scoped_refptr<FakePicturePileImpl> CreateFilledPile( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds); + gfx::Size tile_size, + gfx::Size layer_bounds); static scoped_refptr<FakePicturePileImpl> CreateEmptyPile( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds); + gfx::Size tile_size, + gfx::Size layer_bounds); static scoped_refptr<FakePicturePileImpl> CreatePileWithRecordedRegion( - const gfx::Size& tile_size, - const gfx::Size& layer_bounds, + gfx::Size tile_size, + gfx::Size layer_bounds, const Region& recorded_region); static scoped_refptr<FakePicturePileImpl> CreatePile(); diff --git a/cc/test/layer_tree_pixel_test.cc b/cc/test/layer_tree_pixel_test.cc index c5d2125..806b877 100644 --- a/cc/test/layer_tree_pixel_test.cc +++ b/cc/test/layer_tree_pixel_test.cc @@ -228,7 +228,7 @@ void LayerTreePixelTest::SetupTree() { } scoped_ptr<SkBitmap> LayerTreePixelTest::CopyTextureMailboxToBitmap( - const gfx::Size& size, + gfx::Size size, const TextureMailbox& texture_mailbox) { DCHECK(texture_mailbox.IsTexture()); if (!texture_mailbox.IsTexture()) diff --git a/cc/test/layer_tree_pixel_test.h b/cc/test/layer_tree_pixel_test.h index 426cd02..a72f1db 100644 --- a/cc/test/layer_tree_pixel_test.h +++ b/cc/test/layer_tree_pixel_test.h @@ -75,7 +75,7 @@ class LayerTreePixelTest : public LayerTreeTest { base::FilePath file_name); scoped_ptr<SkBitmap> CopyTextureMailboxToBitmap( - const gfx::Size& size, + gfx::Size size, const TextureMailbox& texture_mailbox); void CopyBitmapToTextureMailboxAsTexture( diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index e84540e..1257be6 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -137,7 +137,7 @@ void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { 0).PassAs<DirectRenderer>(); } -void PixelTest::ForceExpandedViewport(const gfx::Size& surface_expansion) { +void PixelTest::ForceExpandedViewport(gfx::Size surface_expansion) { static_cast<PixelTestOutputSurface*>(output_surface_.get()) ->set_surface_expansion_size(surface_expansion); SoftwareOutputDevice* device = output_surface_->software_device(); diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h index 6d5c552..b6e0242 100644 --- a/cc/test/pixel_test.h +++ b/cc/test/pixel_test.h @@ -59,7 +59,7 @@ class PixelTest : public testing::Test, RendererClient { void SetUpGLRenderer(bool use_skia_gpu_backend); void SetUpSoftwareRenderer(); - void ForceExpandedViewport(const gfx::Size& surface_expansion); + void ForceExpandedViewport(gfx::Size surface_expansion); void ForceViewportOffset(gfx::Vector2d viewport_offset); void ForceDeviceClip(const gfx::Rect& clip); void EnableExternalStencilTest(); diff --git a/cc/test/pixel_test_output_surface.cc b/cc/test/pixel_test_output_surface.cc index c773a52..e3f62bd 100644 --- a/cc/test/pixel_test_output_surface.cc +++ b/cc/test/pixel_test_output_surface.cc @@ -17,8 +17,7 @@ PixelTestOutputSurface::PixelTestOutputSurface( scoped_ptr<SoftwareOutputDevice> software_device) : OutputSurface(software_device.Pass()), external_stencil_test_(false) {} -void PixelTestOutputSurface::Reshape(const gfx::Size& size, - float scale_factor) { +void PixelTestOutputSurface::Reshape(gfx::Size size, float scale_factor) { gfx::Size expanded_size(size.width() + surface_expansion_size_.width(), size.height() + surface_expansion_size_.height()); OutputSurface::Reshape(expanded_size, scale_factor); diff --git a/cc/test/pixel_test_output_surface.h b/cc/test/pixel_test_output_surface.h index d3ec612..2a4573a 100644 --- a/cc/test/pixel_test_output_surface.h +++ b/cc/test/pixel_test_output_surface.h @@ -16,10 +16,10 @@ class PixelTestOutputSurface : public OutputSurface { explicit PixelTestOutputSurface( scoped_ptr<SoftwareOutputDevice> software_device); - virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; + virtual void Reshape(gfx::Size size, float scale_factor) OVERRIDE; virtual bool HasExternalStencilTest() const OVERRIDE; - void set_surface_expansion_size(const gfx::Size& surface_expansion_size) { + void set_surface_expansion_size(gfx::Size surface_expansion_size) { surface_expansion_size_ = surface_expansion_size; } void set_has_external_stencil_test(bool has_test) { diff --git a/cc/test/pixel_test_software_output_device.cc b/cc/test/pixel_test_software_output_device.cc index a8d986c..d4f0b88 100644 --- a/cc/test/pixel_test_software_output_device.cc +++ b/cc/test/pixel_test_software_output_device.cc @@ -6,7 +6,7 @@ namespace cc { -void PixelTestSoftwareOutputDevice::Resize(const gfx::Size& size) { +void PixelTestSoftwareOutputDevice::Resize(gfx::Size size) { gfx::Size expanded_size(size.width() + surface_expansion_size_.width(), size.height() + surface_expansion_size_.height()); SoftwareOutputDevice::Resize(expanded_size); diff --git a/cc/test/pixel_test_software_output_device.h b/cc/test/pixel_test_software_output_device.h index 7c1dae6..b652063 100644 --- a/cc/test/pixel_test_software_output_device.h +++ b/cc/test/pixel_test_software_output_device.h @@ -11,9 +11,9 @@ namespace cc { class PixelTestSoftwareOutputDevice : public SoftwareOutputDevice { public: - virtual void Resize(const gfx::Size& size) OVERRIDE; + virtual void Resize(gfx::Size size) OVERRIDE; - void set_surface_expansion_size(const gfx::Size& surface_expansion_size) { + void set_surface_expansion_size(gfx::Size surface_expansion_size) { surface_expansion_size_ = surface_expansion_size; } diff --git a/cc/test/skia_common.cc b/cc/test/skia_common.cc index 277a124..dfccd64 100644 --- a/cc/test/skia_common.cc +++ b/cc/test/skia_common.cc @@ -25,7 +25,7 @@ void DrawPicture(unsigned char* buffer, picture->Raster(&canvas, NULL, layer_rect, 1.0f); } -void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap) { +void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap) { SkImageInfo info = { size.width(), size.height(), diff --git a/cc/test/skia_common.h b/cc/test/skia_common.h index 3bafa0b..3424799 100644 --- a/cc/test/skia_common.h +++ b/cc/test/skia_common.h @@ -23,7 +23,7 @@ void DrawPicture(unsigned char* buffer, const gfx::Rect& layer_rect, scoped_refptr<Picture> picture); -void CreateBitmap(const gfx::Size& size, const char* uri, SkBitmap* bitmap); +void CreateBitmap(gfx::Size size, const char* uri, SkBitmap* bitmap); } // namespace cc diff --git a/cc/test/test_texture.cc b/cc/test/test_texture.cc index 8addc79..0f4f07c 100644 --- a/cc/test/test_texture.cc +++ b/cc/test/test_texture.cc @@ -9,7 +9,7 @@ namespace cc { -size_t TextureSizeBytes(const gfx::Size& size, ResourceFormat format) { +size_t TextureSizeBytes(gfx::Size size, ResourceFormat format) { unsigned int components_per_pixel = 4; unsigned int bytes_per_component = 1; return size.width() * size.height() * components_per_pixel * @@ -28,7 +28,7 @@ TestTexture::TestTexture() : format(RGBA_8888) { TestTexture::~TestTexture() {} -void TestTexture::Reallocate(const gfx::Size& size, ResourceFormat format) { +void TestTexture::Reallocate(gfx::Size size, ResourceFormat format) { this->size = size; this->format = format; this->data.reset(new uint8_t[TextureSizeBytes(size, format)]); diff --git a/cc/test/test_texture.h b/cc/test/test_texture.h index 0e50bf0..f5070e1 100644 --- a/cc/test/test_texture.h +++ b/cc/test/test_texture.h @@ -14,12 +14,12 @@ namespace cc { -size_t TextureSizeBytes(const gfx::Size& size, ResourceFormat format); +size_t TextureSizeBytes(gfx::Size size, ResourceFormat format); struct TestTexture : public base::RefCounted<TestTexture> { TestTexture(); - void Reallocate(const gfx::Size& size, ResourceFormat format); + void Reallocate(gfx::Size size, ResourceFormat format); bool IsValidParameter(GLenum pname); gfx::Size size; diff --git a/cc/test/tiled_layer_test_common.cc b/cc/test/tiled_layer_test_common.cc index e39765e..6dddfd3 100644 --- a/cc/test/tiled_layer_test_common.cc +++ b/cc/test/tiled_layer_test_common.cc @@ -35,7 +35,7 @@ FakeLayerUpdater::FakeLayerUpdater() : prepare_count_(0), update_count_(0) {} FakeLayerUpdater::~FakeLayerUpdater() {} void FakeLayerUpdater::PrepareToUpdate(const gfx::Rect& content_rect, - const gfx::Size& tile_size, + gfx::Size tile_size, float contents_width_scale, float contents_height_scale, gfx::Rect* resulting_opaque_rect) { @@ -148,7 +148,7 @@ LayerUpdater* FakeTiledLayer::Updater() const { } void FakeTiledLayerWithScaledBounds::SetContentBounds( - const gfx::Size& content_bounds) { + gfx::Size content_bounds) { forced_content_bounds_ = content_bounds; draw_properties().content_bounds = forced_content_bounds_; } diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h index 1e1aace..17de629 100644 --- a/cc/test/tiled_layer_test_common.h +++ b/cc/test/tiled_layer_test_common.h @@ -46,7 +46,7 @@ class FakeLayerUpdater : public LayerUpdater { PrioritizedResourceManager* resource) OVERRIDE; virtual void PrepareToUpdate(const gfx::Rect& content_rect, - const gfx::Size& tile_size, + gfx::Size tile_size, float contents_width_scale, float contents_height_scale, gfx::Rect* resulting_opaque_rect) OVERRIDE; @@ -139,7 +139,7 @@ class FakeTiledLayerWithScaledBounds : public FakeTiledLayer { explicit FakeTiledLayerWithScaledBounds( PrioritizedResourceManager* resource_manager); - void SetContentBounds(const gfx::Size& content_bounds); + void SetContentBounds(gfx::Size content_bounds); virtual void CalculateContentsScale(float ideal_contents_scale, float device_scale_factor, float page_scale_factor, |