diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-24 12:15:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:30:04 +0000 |
commit | b014812705fc80bff0a5c120dfcef88f349816dc (patch) | |
tree | 25a2e2d9fa285f1add86aa333389a839f81a39ae /chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h | |
parent | 9f4560b1027ae06fdb497023cdcaf91b8511fa74 (diff) | |
download | qtwebengine-chromium-b014812705fc80bff0a5c120dfcef88f349816dc.tar.gz |
BASELINE: Update Chromium to 68.0.3440.125
Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h b/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h index 3d1b69454c3..92afb24c0d9 100644 --- a/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h +++ b/chromium/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d_state.h @@ -11,6 +11,7 @@ #include "third_party/blink/renderer/platform/graphics/paint/paint_filter.h" #include "third_party/blink/renderer/platform/graphics/paint/paint_flags.h" #include "third_party/blink/renderer/platform/transforms/affine_transform.h" +#include "third_party/blink/renderer/platform/wtf/math_extras.h" #include "third_party/blink/renderer/platform/wtf/vector.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -35,7 +36,7 @@ class CanvasRenderingContext2DState final ~CanvasRenderingContext2DState() override; - virtual void Trace(blink::Visitor*); + void Trace(blink::Visitor*) override; enum ClipListCopyMode { kCopyClipList, kDontCopyClipList }; @@ -127,7 +128,7 @@ class CanvasRenderingContext2DState final TextBaseline GetTextBaseline() const { return text_baseline_; } void SetLineWidth(double line_width) { - stroke_flags_.setStrokeWidth(line_width); + stroke_flags_.setStrokeWidth(clampTo<float>(line_width)); } double LineWidth() const { return stroke_flags_.getStrokeWidth(); } @@ -146,7 +147,7 @@ class CanvasRenderingContext2DState final } void SetMiterLimit(double miter_limit) { - stroke_flags_.setStrokeMiter(miter_limit); + stroke_flags_.setStrokeMiter(clampTo<float>(miter_limit)); } double MiterLimit() const { return stroke_flags_.getStrokeMiter(); } |