| OLD | NEW |
| 1 // Copyright (C) 2013 Google Inc. All rights reserved. | 1 // Copyright (C) 2013 Google Inc. All rights reserved. |
| 2 // | 2 // |
| 3 // Redistribution and use in source and binary forms, with or without | 3 // Redistribution and use in source and binary forms, with or without |
| 4 // modification, are permitted provided that the following conditions are | 4 // modification, are permitted provided that the following conditions are |
| 5 // met: | 5 // met: |
| 6 // | 6 // |
| 7 // * Redistributions of source code must retain the above copyright | 7 // * Redistributions of source code must retain the above copyright |
| 8 // notice, this list of conditions and the following disclaimer. | 8 // notice, this list of conditions and the following disclaimer. |
| 9 // * Redistributions in binary form must reproduce the above | 9 // * Redistributions in binary form must reproduce the above |
| 10 // copyright notice, this list of conditions and the following disclaimer | 10 // copyright notice, this list of conditions and the following disclaimer |
| 11 // in the documentation and/or other materials provided with the | 11 // in the documentation and/or other materials provided with the |
| 12 // distribution. | 12 // distribution. |
| 13 // * Neither the name of Google Inc. nor the names of its | 13 // * Neither the name of Google Inc. nor the names of its |
| 14 // contributors may be used to endorse or promote products derived from | 14 // contributors may be used to endorse or promote products derived from |
| 15 // this software without specific prior written permission. | 15 // this software without specific prior written permission. |
| 16 // | 16 // |
| 17 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 17 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
| 18 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 18 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
| 19 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 19 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
| 20 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 20 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
| 21 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 21 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 22 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 22 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 23 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 23 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 24 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 #include "platform/graphics/StrokeData.h" | 29 #include "platform/graphics/StrokeData.h" |
| 30 #include "platform/graphics/paint/PaintFlags.h" |
| 30 #include "third_party/skia/include/effects/SkDashPathEffect.h" | 31 #include "third_party/skia/include/effects/SkDashPathEffect.h" |
| 31 #include "wtf/PtrUtil.h" | 32 #include "wtf/PtrUtil.h" |
| 32 #include <memory> | 33 #include <memory> |
| 33 | 34 |
| 34 namespace blink { | 35 namespace blink { |
| 35 | 36 |
| 36 static const int dashRatio = 3; // Ratio of the length of a dash to its width. | 37 static const int dashRatio = 3; // Ratio of the length of a dash to its width. |
| 37 | 38 |
| 38 void StrokeData::setLineDash(const DashArray& dashes, float dashOffset) { | 39 void StrokeData::setLineDash(const DashArray& dashes, float dashOffset) { |
| 39 // FIXME: This is lifted directly off SkiaSupport, lines 49-74 | 40 // FIXME: This is lifted directly off SkiaSupport, lines 49-74 |
| 40 // so it is not guaranteed to work correctly. | 41 // so it is not guaranteed to work correctly. |
| 41 size_t dashLength = dashes.size(); | 42 size_t dashLength = dashes.size(); |
| 42 if (!dashLength) { | 43 if (!dashLength) { |
| 43 // If no dash is set, revert to solid stroke | 44 // If no dash is set, revert to solid stroke |
| 44 // FIXME: do we need to set NoStroke in some cases? | 45 // FIXME: do we need to set NoStroke in some cases? |
| 45 m_style = SolidStroke; | 46 m_style = SolidStroke; |
| 46 m_dash.reset(); | 47 m_dash.reset(); |
| 47 return; | 48 return; |
| 48 } | 49 } |
| 49 | 50 |
| 50 size_t count = !(dashLength % 2) ? dashLength : dashLength * 2; | 51 size_t count = !(dashLength % 2) ? dashLength : dashLength * 2; |
| 51 std::unique_ptr<SkScalar[]> intervals = wrapArrayUnique(new SkScalar[count]); | 52 std::unique_ptr<SkScalar[]> intervals = wrapArrayUnique(new SkScalar[count]); |
| 52 | 53 |
| 53 for (unsigned i = 0; i < count; i++) | 54 for (unsigned i = 0; i < count; i++) |
| 54 intervals[i] = dashes[i % dashLength]; | 55 intervals[i] = dashes[i % dashLength]; |
| 55 | 56 |
| 56 m_dash = SkDashPathEffect::Make(intervals.get(), count, dashOffset); | 57 m_dash = SkDashPathEffect::Make(intervals.get(), count, dashOffset); |
| 57 } | 58 } |
| 58 | 59 |
| 59 void StrokeData::setupPaint(SkPaint* paint, int length) const { | 60 void StrokeData::setupPaint(PaintFlags* paint, int length) const { |
| 60 paint->setStyle(SkPaint::kStroke_Style); | 61 paint->setStyle(PaintFlags::kStroke_Style); |
| 61 paint->setStrokeWidth(SkFloatToScalar(m_thickness)); | 62 paint->setStrokeWidth(SkFloatToScalar(m_thickness)); |
| 62 paint->setStrokeCap(m_lineCap); | 63 paint->setStrokeCap(m_lineCap); |
| 63 paint->setStrokeJoin(m_lineJoin); | 64 paint->setStrokeJoin(m_lineJoin); |
| 64 paint->setStrokeMiter(SkFloatToScalar(m_miterLimit)); | 65 paint->setStrokeMiter(SkFloatToScalar(m_miterLimit)); |
| 65 | 66 |
| 66 setupPaintDashPathEffect(paint, length); | 67 setupPaintDashPathEffect(paint, length); |
| 67 } | 68 } |
| 68 | 69 |
| 69 void StrokeData::setupPaintDashPathEffect(SkPaint* paint, int length) const { | 70 void StrokeData::setupPaintDashPathEffect(PaintFlags* paint, int length) const { |
| 70 float width = m_thickness; | 71 float width = m_thickness; |
| 71 if (m_dash) { | 72 if (m_dash) { |
| 72 paint->setPathEffect(m_dash); | 73 paint->setPathEffect(m_dash); |
| 73 } else { | 74 } else { |
| 74 switch (m_style) { | 75 switch (m_style) { |
| 75 case NoStroke: | 76 case NoStroke: |
| 76 case SolidStroke: | 77 case SolidStroke: |
| 77 case DoubleStroke: | 78 case DoubleStroke: |
| 78 case WavyStroke: // FIXME: https://crbug.com/229574 | 79 case WavyStroke: // FIXME: https://crbug.com/229574 |
| 79 paint->setPathEffect(0); | 80 paint->setPathEffect(0); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 102 } | 103 } |
| 103 SkScalar dashLengthSk = SkIntToScalar(dashLength); | 104 SkScalar dashLengthSk = SkIntToScalar(dashLength); |
| 104 SkScalar intervals[2] = {dashLengthSk, dashLengthSk}; | 105 SkScalar intervals[2] = {dashLengthSk, dashLengthSk}; |
| 105 paint->setPathEffect( | 106 paint->setPathEffect( |
| 106 SkDashPathEffect::Make(intervals, 2, SkIntToScalar(phase))); | 107 SkDashPathEffect::Make(intervals, 2, SkIntToScalar(phase))); |
| 107 } | 108 } |
| 108 } | 109 } |
| 109 } | 110 } |
| 110 | 111 |
| 111 } // namespace blink | 112 } // namespace blink |
| OLD | NEW |