| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/layers/nine_patch_layer_impl.h" | 5 #include "cc/layers/nine_patch_layer_impl.h" |
| 6 | 6 |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "cc/layers/quad_sink.h" | 9 #include "cc/layers/quad_sink.h" |
| 10 #include "cc/quads/texture_draw_quad.h" | 10 #include "cc/quads/texture_draw_quad.h" |
| 11 #include "cc/trees/layer_tree_impl.h" |
| 11 #include "ui/gfx/rect_f.h" | 12 #include "ui/gfx/rect_f.h" |
| 12 | 13 |
| 13 namespace cc { | 14 namespace cc { |
| 14 | 15 |
| 15 NinePatchLayerImpl::NinePatchLayerImpl(LayerTreeImpl* tree_impl, int id) | 16 NinePatchLayerImpl::NinePatchLayerImpl(LayerTreeImpl* tree_impl, int id) |
| 16 : LayerImpl(tree_impl, id), | 17 : LayerImpl(tree_impl, id), |
| 17 resource_id_(0) {} | 18 fill_center_(false), |
| 19 ui_resource_id_(0) {} |
| 18 | 20 |
| 19 NinePatchLayerImpl::~NinePatchLayerImpl() {} | 21 NinePatchLayerImpl::~NinePatchLayerImpl() {} |
| 20 | 22 |
| 21 ResourceProvider::ResourceId NinePatchLayerImpl::ContentsResourceId() const { | 23 ResourceProvider::ResourceId NinePatchLayerImpl::ContentsResourceId() const { |
| 22 return 0; | 24 return 0; |
| 23 } | 25 } |
| 24 | 26 |
| 25 scoped_ptr<LayerImpl> NinePatchLayerImpl::CreateLayerImpl( | 27 scoped_ptr<LayerImpl> NinePatchLayerImpl::CreateLayerImpl( |
| 26 LayerTreeImpl* tree_impl) { | 28 LayerTreeImpl* tree_impl) { |
| 27 return NinePatchLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>(); | 29 return NinePatchLayerImpl::Create(tree_impl, id()).PassAs<LayerImpl>(); |
| 28 } | 30 } |
| 29 | 31 |
| 30 void NinePatchLayerImpl::PushPropertiesTo(LayerImpl* layer) { | 32 void NinePatchLayerImpl::PushPropertiesTo(LayerImpl* layer) { |
| 31 LayerImpl::PushPropertiesTo(layer); | 33 LayerImpl::PushPropertiesTo(layer); |
| 32 NinePatchLayerImpl* layer_impl = static_cast<NinePatchLayerImpl*>(layer); | 34 NinePatchLayerImpl* layer_impl = static_cast<NinePatchLayerImpl*>(layer); |
| 33 | 35 |
| 34 if (!resource_id_) | 36 layer_impl->set_ui_resource_id(ui_resource_id_); |
| 35 return; | 37 layer_impl->SetLayout(image_bounds_, image_aperture_, border_, fill_center_); |
| 36 | |
| 37 layer_impl->SetResourceId(resource_id_); | |
| 38 layer_impl->SetLayout(image_bounds_, image_aperture_); | |
| 39 } | 38 } |
| 40 | 39 |
| 41 static gfx::RectF NormalizedRect(float x, | 40 static gfx::RectF NormalizedRect(float x, |
| 42 float y, | 41 float y, |
| 43 float width, | 42 float width, |
| 44 float height, | 43 float height, |
| 45 float total_width, | 44 float total_width, |
| 46 float total_height) { | 45 float total_height) { |
| 47 return gfx::RectF(x / total_width, | 46 return gfx::RectF(x / total_width, |
| 48 y / total_height, | 47 y / total_height, |
| 49 width / total_width, | 48 width / total_width, |
| 50 height / total_height); | 49 height / total_height); |
| 51 } | 50 } |
| 52 | 51 |
| 53 void NinePatchLayerImpl::SetLayout(gfx::Size image_bounds, gfx::Rect aperture) { | 52 void NinePatchLayerImpl::SetLayout(gfx::Size image_bounds, gfx::Rect aperture, |
| 53 gfx::Rect border, bool fill_center) { |
| 54 image_bounds_ = image_bounds; | 54 image_bounds_ = image_bounds; |
| 55 image_aperture_ = aperture; | 55 image_aperture_ = aperture; |
| 56 border_ = border; |
| 57 fill_center_ = fill_center; |
| 56 } | 58 } |
| 57 | 59 |
| 58 bool NinePatchLayerImpl::WillDraw(DrawMode draw_mode, | 60 bool NinePatchLayerImpl::WillDraw(DrawMode draw_mode, |
| 59 ResourceProvider* resource_provider) { | 61 ResourceProvider* resource_provider) { |
| 60 if (!resource_id_ || draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE) | 62 if (!ui_resource_id_ || draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE) |
| 61 return false; | 63 return false; |
| 62 return LayerImpl::WillDraw(draw_mode, resource_provider); | 64 return LayerImpl::WillDraw(draw_mode, resource_provider); |
| 63 } | 65 } |
| 64 | 66 |
| 65 void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink, | 67 void NinePatchLayerImpl::AppendQuads(QuadSink* quad_sink, |
| 66 AppendQuadsData* append_quads_data) { | 68 AppendQuadsData* append_quads_data) { |
| 69 if (!ui_resource_id_ || !layer_tree_impl()) |
| 70 return; |
| 71 |
| 72 ResourceProvider::ResourceId resource = |
| 73 layer_tree_impl()->ResourceIdForUIResource(ui_resource_id_); |
| 74 |
| 75 if (!resource) |
| 76 return; |
| 77 |
| 67 SharedQuadState* shared_quad_state = | 78 SharedQuadState* shared_quad_state = |
| 68 quad_sink->UseSharedQuadState(CreateSharedQuadState()); | 79 quad_sink->UseSharedQuadState(CreateSharedQuadState()); |
| 69 AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data); | 80 AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data); |
| 70 | 81 |
| 71 if (!resource_id_) | |
| 72 return; | |
| 73 | |
| 74 static const bool flipped = false; | 82 static const bool flipped = false; |
| 75 static const bool premultiplied_alpha = true; | 83 static const bool premultiplied_alpha = true; |
| 76 | 84 |
| 77 DCHECK(!bounds().IsEmpty()); | 85 DCHECK(!bounds().IsEmpty()); |
| 78 | 86 |
| 79 // NinePatch border widths in bitmap pixel space | 87 // NinePatch border widths in bitmap pixel space |
| 80 int left_width = image_aperture_.x(); | 88 // NinePatch border widths in layer space |
| 81 int top_height = image_aperture_.y(); | 89 int left_width = border_.x(); |
| 82 int right_width = image_bounds_.width() - image_aperture_.right(); | 90 int top_height = border_.y(); |
| 83 int bottom_height = image_bounds_.height() - image_aperture_.bottom(); | 91 int right_width = border_.width() - left_width; |
| 92 int bottom_height = border_.height() - top_height; |
| 84 | 93 |
| 85 // If layer can't fit the corners, clip to show the outer edges of the | 94 // If layer can't fit the corners, clip to show the outer edges of the |
| 86 // image. | 95 // image. |
| 87 int corner_total_width = left_width + right_width; | 96 int corner_total_width = left_width + right_width; |
| 88 int middle_width = bounds().width() - corner_total_width; | 97 int middle_width = bounds().width() - corner_total_width; |
| 89 if (middle_width < 0) { | 98 if (middle_width < 0) { |
| 90 float left_width_proportion = | 99 float left_width_proportion = |
| 91 static_cast<float>(left_width) / corner_total_width; | 100 static_cast<float>(left_width) / corner_total_width; |
| 92 int left_width_crop = middle_width * left_width_proportion; | 101 int left_width_crop = middle_width * left_width_proportion; |
| 93 left_width += left_width_crop; | 102 left_width += left_width_crop; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 113 0, bounds().height() - bottom_height, left_width, bottom_height); | 122 0, bounds().height() - bottom_height, left_width, bottom_height); |
| 114 gfx::Rect bottom_right( | 123 gfx::Rect bottom_right( |
| 115 top_right.x(), bottom_left.y(), right_width, bottom_height); | 124 top_right.x(), bottom_left.y(), right_width, bottom_height); |
| 116 gfx::Rect top(top_left.right(), 0, middle_width, top_height); | 125 gfx::Rect top(top_left.right(), 0, middle_width, top_height); |
| 117 gfx::Rect left(0, top_left.bottom(), left_width, middle_height); | 126 gfx::Rect left(0, top_left.bottom(), left_width, middle_height); |
| 118 gfx::Rect right(top_right.x(), | 127 gfx::Rect right(top_right.x(), |
| 119 top_right.bottom(), | 128 top_right.bottom(), |
| 120 right_width, | 129 right_width, |
| 121 left.height()); | 130 left.height()); |
| 122 gfx::Rect bottom(top.x(), bottom_left.y(), top.width(), bottom_height); | 131 gfx::Rect bottom(top.x(), bottom_left.y(), top.width(), bottom_height); |
| 132 gfx::Rect center(left_width, top_height, |
| 133 middle_width, |
| 134 middle_height); |
| 123 | 135 |
| 124 float img_width = image_bounds_.width(); | 136 float img_width = image_bounds_.width(); |
| 125 float img_height = image_bounds_.height(); | 137 float img_height = image_bounds_.height(); |
| 126 | 138 |
| 139 int aperture_left_width = image_aperture_.x(); |
| 140 int aperture_top_height = image_aperture_.y(); |
| 141 int aperture_right_width = img_width - image_aperture_.right(); |
| 142 int aperture_bottom_height = img_height - image_aperture_.bottom(); |
| 127 // Patch positions in bitmap UV space (from zero to one) | 143 // Patch positions in bitmap UV space (from zero to one) |
| 128 gfx::RectF uv_top_left = NormalizedRect(0, | 144 gfx::RectF uv_top_left = NormalizedRect( |
| 129 0, | 145 0, 0, aperture_left_width, aperture_top_height, img_width, img_height); |
| 130 left_width, | 146 gfx::RectF uv_top_right = NormalizedRect(img_width - aperture_right_width, |
| 131 top_height, | |
| 132 img_width, | |
| 133 img_height); | |
| 134 gfx::RectF uv_top_right = NormalizedRect(img_width - right_width, | |
| 135 0, | 147 0, |
| 136 right_width, | 148 aperture_right_width, |
| 137 top_height, | 149 aperture_top_height, |
| 138 img_width, | 150 img_width, |
| 139 img_height); | 151 img_height); |
| 140 gfx::RectF uv_bottom_left = NormalizedRect(0, | 152 gfx::RectF uv_bottom_left = |
| 141 img_height - bottom_height, | 153 NormalizedRect(0, |
| 142 left_width, | 154 img_height - aperture_bottom_height, |
| 143 bottom_height, | 155 aperture_left_width, |
| 144 img_width, | 156 aperture_bottom_height, |
| 145 img_height); | 157 img_width, |
| 146 gfx::RectF uv_bottom_right = NormalizedRect(img_width - right_width, | 158 img_height); |
| 147 img_height - bottom_height, | 159 gfx::RectF uv_bottom_right = |
| 148 right_width, | 160 NormalizedRect(img_width - aperture_right_width, |
| 149 bottom_height, | 161 img_height - aperture_bottom_height, |
| 150 img_width, | 162 aperture_right_width, |
| 151 img_height); | 163 aperture_bottom_height, |
| 152 gfx::RectF uv_top(uv_top_left.right(), | 164 img_width, |
| 153 0, | 165 img_height); |
| 154 (img_width - left_width - right_width) / img_width, | 166 gfx::RectF uv_top( |
| 155 (top_height) / img_height); | 167 uv_top_left.right(), |
| 156 gfx::RectF uv_left(0, | 168 0, |
| 157 uv_top_left.bottom(), | 169 (img_width - aperture_left_width - aperture_right_width) / img_width, |
| 158 left_width / img_width, | 170 (aperture_top_height) / img_height); |
| 159 (img_height - top_height - bottom_height) / img_height); | 171 gfx::RectF uv_left( |
| 172 0, |
| 173 uv_top_left.bottom(), |
| 174 aperture_left_width / img_width, |
| 175 (img_height - aperture_top_height - aperture_bottom_height) / img_height); |
| 160 gfx::RectF uv_right(uv_top_right.x(), | 176 gfx::RectF uv_right(uv_top_right.x(), |
| 161 uv_top_right.bottom(), | 177 uv_top_right.bottom(), |
| 162 right_width / img_width, | 178 aperture_right_width / img_width, |
| 163 uv_left.height()); | 179 uv_left.height()); |
| 164 gfx::RectF uv_bottom(uv_top.x(), | 180 gfx::RectF uv_bottom(uv_top.x(), |
| 165 uv_bottom_left.y(), | 181 uv_bottom_left.y(), |
| 166 uv_top.width(), | 182 uv_top.width(), |
| 167 bottom_height / img_height); | 183 aperture_bottom_height / img_height); |
| 184 gfx::RectF uv_center(uv_top_left.right(), |
| 185 uv_top_left.bottom(), |
| 186 uv_top.width(), |
| 187 uv_left.height()); |
| 168 | 188 |
| 169 // Nothing is opaque here. | 189 // Nothing is opaque here. |
| 170 // TODO(danakj): Should we look at the SkBitmaps to determine opaqueness? | 190 // TODO(danakj): Should we look at the SkBitmaps to determine opaqueness? |
| 171 gfx::Rect opaque_rect; | 191 gfx::Rect opaque_rect; |
| 172 const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; | 192 const float vertex_opacity[] = {1.0f, 1.0f, 1.0f, 1.0f}; |
| 173 scoped_ptr<TextureDrawQuad> quad; | 193 scoped_ptr<TextureDrawQuad> quad; |
| 174 | 194 |
| 175 quad = TextureDrawQuad::Create(); | 195 quad = TextureDrawQuad::Create(); |
| 176 quad->SetNew(shared_quad_state, | 196 quad->SetNew(shared_quad_state, |
| 177 top_left, | 197 top_left, |
| 178 opaque_rect, | 198 opaque_rect, |
| 179 resource_id_, | 199 resource, |
| 180 premultiplied_alpha, | 200 premultiplied_alpha, |
| 181 uv_top_left.origin(), | 201 uv_top_left.origin(), |
| 182 uv_top_left.bottom_right(), | 202 uv_top_left.bottom_right(), |
| 183 SK_ColorTRANSPARENT, | 203 SK_ColorTRANSPARENT, |
| 184 vertex_opacity, | 204 vertex_opacity, |
| 185 flipped); | 205 flipped); |
| 186 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 206 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 187 | 207 |
| 188 quad = TextureDrawQuad::Create(); | 208 quad = TextureDrawQuad::Create(); |
| 189 quad->SetNew(shared_quad_state, | 209 quad->SetNew(shared_quad_state, |
| 190 top_right, | 210 top_right, |
| 191 opaque_rect, | 211 opaque_rect, |
| 192 resource_id_, | 212 resource, |
| 193 premultiplied_alpha, | 213 premultiplied_alpha, |
| 194 uv_top_right.origin(), | 214 uv_top_right.origin(), |
| 195 uv_top_right.bottom_right(), | 215 uv_top_right.bottom_right(), |
| 196 SK_ColorTRANSPARENT, | 216 SK_ColorTRANSPARENT, |
| 197 vertex_opacity, | 217 vertex_opacity, |
| 198 flipped); | 218 flipped); |
| 199 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 219 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 200 | 220 |
| 201 quad = TextureDrawQuad::Create(); | 221 quad = TextureDrawQuad::Create(); |
| 202 quad->SetNew(shared_quad_state, | 222 quad->SetNew(shared_quad_state, |
| 203 bottom_left, | 223 bottom_left, |
| 204 opaque_rect, | 224 opaque_rect, |
| 205 resource_id_, | 225 resource, |
| 206 premultiplied_alpha, | 226 premultiplied_alpha, |
| 207 uv_bottom_left.origin(), | 227 uv_bottom_left.origin(), |
| 208 uv_bottom_left.bottom_right(), | 228 uv_bottom_left.bottom_right(), |
| 209 SK_ColorTRANSPARENT, | 229 SK_ColorTRANSPARENT, |
| 210 vertex_opacity, | 230 vertex_opacity, |
| 211 flipped); | 231 flipped); |
| 212 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 232 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 213 | 233 |
| 214 quad = TextureDrawQuad::Create(); | 234 quad = TextureDrawQuad::Create(); |
| 215 quad->SetNew(shared_quad_state, | 235 quad->SetNew(shared_quad_state, |
| 216 bottom_right, | 236 bottom_right, |
| 217 opaque_rect, | 237 opaque_rect, |
| 218 resource_id_, | 238 resource, |
| 219 premultiplied_alpha, | 239 premultiplied_alpha, |
| 220 uv_bottom_right.origin(), | 240 uv_bottom_right.origin(), |
| 221 uv_bottom_right.bottom_right(), | 241 uv_bottom_right.bottom_right(), |
| 222 SK_ColorTRANSPARENT, | 242 SK_ColorTRANSPARENT, |
| 223 vertex_opacity, | 243 vertex_opacity, |
| 224 flipped); | 244 flipped); |
| 225 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 245 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 226 | 246 |
| 227 quad = TextureDrawQuad::Create(); | 247 quad = TextureDrawQuad::Create(); |
| 228 quad->SetNew(shared_quad_state, | 248 quad->SetNew(shared_quad_state, |
| 229 top, | 249 top, |
| 230 opaque_rect, | 250 opaque_rect, |
| 231 resource_id_, | 251 resource, |
| 232 premultiplied_alpha, | 252 premultiplied_alpha, |
| 233 uv_top.origin(), | 253 uv_top.origin(), |
| 234 uv_top.bottom_right(), | 254 uv_top.bottom_right(), |
| 235 SK_ColorTRANSPARENT, | 255 SK_ColorTRANSPARENT, |
| 236 vertex_opacity, | 256 vertex_opacity, |
| 237 flipped); | 257 flipped); |
| 238 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 258 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 239 | 259 |
| 240 quad = TextureDrawQuad::Create(); | 260 quad = TextureDrawQuad::Create(); |
| 241 quad->SetNew(shared_quad_state, | 261 quad->SetNew(shared_quad_state, |
| 242 left, | 262 left, |
| 243 opaque_rect, | 263 opaque_rect, |
| 244 resource_id_, | 264 resource, |
| 245 premultiplied_alpha, | 265 premultiplied_alpha, |
| 246 uv_left.origin(), | 266 uv_left.origin(), |
| 247 uv_left.bottom_right(), | 267 uv_left.bottom_right(), |
| 248 SK_ColorTRANSPARENT, | 268 SK_ColorTRANSPARENT, |
| 249 vertex_opacity, | 269 vertex_opacity, |
| 250 flipped); | 270 flipped); |
| 251 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 271 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 252 | 272 |
| 253 quad = TextureDrawQuad::Create(); | 273 quad = TextureDrawQuad::Create(); |
| 254 quad->SetNew(shared_quad_state, | 274 quad->SetNew(shared_quad_state, |
| 255 right, | 275 right, |
| 256 opaque_rect, | 276 opaque_rect, |
| 257 resource_id_, | 277 resource, |
| 258 premultiplied_alpha, | 278 premultiplied_alpha, |
| 259 uv_right.origin(), | 279 uv_right.origin(), |
| 260 uv_right.bottom_right(), | 280 uv_right.bottom_right(), |
| 261 SK_ColorTRANSPARENT, | 281 SK_ColorTRANSPARENT, |
| 262 vertex_opacity, | 282 vertex_opacity, |
| 263 flipped); | 283 flipped); |
| 264 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 284 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 265 | 285 |
| 266 quad = TextureDrawQuad::Create(); | 286 quad = TextureDrawQuad::Create(); |
| 267 quad->SetNew(shared_quad_state, | 287 quad->SetNew(shared_quad_state, |
| 268 bottom, | 288 bottom, |
| 269 opaque_rect, | 289 opaque_rect, |
| 270 resource_id_, | 290 resource, |
| 271 premultiplied_alpha, | 291 premultiplied_alpha, |
| 272 uv_bottom.origin(), | 292 uv_bottom.origin(), |
| 273 uv_bottom.bottom_right(), | 293 uv_bottom.bottom_right(), |
| 274 SK_ColorTRANSPARENT, | 294 SK_ColorTRANSPARENT, |
| 275 vertex_opacity, | 295 vertex_opacity, |
| 276 flipped); | 296 flipped); |
| 277 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); | 297 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 278 } | |
| 279 | 298 |
| 280 void NinePatchLayerImpl::DidLoseOutputSurface() { | 299 if (fill_center_) { |
| 281 resource_id_ = 0; | 300 quad = TextureDrawQuad::Create(); |
| 301 quad->SetNew(shared_quad_state, |
| 302 center, |
| 303 opaque_rect, |
| 304 resource, |
| 305 premultiplied_alpha, |
| 306 uv_center.origin(), |
| 307 uv_center.bottom_right(), |
| 308 SK_ColorTRANSPARENT, |
| 309 vertex_opacity, |
| 310 flipped); |
| 311 quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data); |
| 312 } |
| 282 } | 313 } |
| 283 | 314 |
| 284 const char* NinePatchLayerImpl::LayerTypeAsString() const { | 315 const char* NinePatchLayerImpl::LayerTypeAsString() const { |
| 285 return "cc::NinePatchLayerImpl"; | 316 return "cc::NinePatchLayerImpl"; |
| 286 } | 317 } |
| 287 | 318 |
| 288 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const { | 319 base::DictionaryValue* NinePatchLayerImpl::LayerTreeAsJson() const { |
| 289 base::DictionaryValue* result = LayerImpl::LayerTreeAsJson(); | 320 base::DictionaryValue* result = LayerImpl::LayerTreeAsJson(); |
| 290 | 321 |
| 291 base::ListValue* list = new base::ListValue; | 322 base::ListValue* list = new base::ListValue; |
| 292 list->AppendInteger(image_aperture_.origin().x()); | 323 list->AppendInteger(image_aperture_.origin().x()); |
| 293 list->AppendInteger(image_aperture_.origin().y()); | 324 list->AppendInteger(image_aperture_.origin().y()); |
| 294 list->AppendInteger(image_aperture_.size().width()); | 325 list->AppendInteger(image_aperture_.size().width()); |
| 295 list->AppendInteger(image_aperture_.size().height()); | 326 list->AppendInteger(image_aperture_.size().height()); |
| 296 result->Set("ImageAperture", list); | 327 result->Set("ImageAperture", list); |
| 297 | 328 |
| 298 list = new base::ListValue; | 329 list = new base::ListValue; |
| 299 list->AppendInteger(image_bounds_.width()); | 330 list->AppendInteger(image_bounds_.width()); |
| 300 list->AppendInteger(image_bounds_.height()); | 331 list->AppendInteger(image_bounds_.height()); |
| 301 result->Set("ImageBounds", list); | 332 result->Set("ImageBounds", list); |
| 302 | 333 |
| 303 return result; | 334 return result; |
| 304 } | 335 } |
| 305 | 336 |
| 306 } // namespace cc | 337 } // namespace cc |
| OLD | NEW |