Commit 35a03a6a authored by Takuto Ikuta's avatar Takuto Ikuta Committed by Commit Bot

[ui] use default member initializer in MockDrawableData

This is just for workaround the swarming output collapsion bug.

TBR=thakis@chromium.org, mohsen@chromium.org

Bug: 993247
Change-Id: Id1383aaf292419622997217276cb05faefcd4084
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750477Reviewed-by: default avatarTakuto Ikuta <tikuta@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686377}
parent 73254b14
...@@ -20,19 +20,13 @@ const float kDefaultDrawableSize = 10.f; ...@@ -20,19 +20,13 @@ const float kDefaultDrawableSize = 10.f;
const gfx::RectF kDefaultViewportRect(0, 0, 560, 1200); const gfx::RectF kDefaultViewportRect(0, 0, 560, 1200);
struct MockDrawableData { struct MockDrawableData {
MockDrawableData() TouchHandleOrientation orientation = TouchHandleOrientation::UNDEFINED;
: orientation(TouchHandleOrientation::UNDEFINED), float alpha = 0.f;
alpha(0.f),
enabled(false),
visible(false),
rect(0, 0, kDefaultDrawableSize, kDefaultDrawableSize) {}
TouchHandleOrientation orientation;
float alpha;
bool mirror_horizontal; bool mirror_horizontal;
bool mirror_vertical; bool mirror_vertical;
bool enabled; bool enabled = false;
bool visible; bool visible = false;
gfx::RectF rect; gfx::RectF rect{0, 0, kDefaultDrawableSize, kDefaultDrawableSize};
}; };
class MockTouchHandleDrawable : public TouchHandleDrawable { class MockTouchHandleDrawable : public TouchHandleDrawable {
...@@ -63,9 +57,7 @@ class MockTouchHandleDrawable : public TouchHandleDrawable { ...@@ -63,9 +57,7 @@ class MockTouchHandleDrawable : public TouchHandleDrawable {
// code refactoring is completed. // code refactoring is completed.
float GetDrawableHorizontalPaddingRatio() const override { return 0; } float GetDrawableHorizontalPaddingRatio() const override { return 0; }
gfx::RectF GetVisibleBounds() const override { gfx::RectF GetVisibleBounds() const override { return data_->rect; }
return data_->rect;
}
private: private:
MockDrawableData* data_; MockDrawableData* data_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment