Changeset 87933 in webkit
- Timestamp:
- Jun 2, 2011 11:27:27 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r87931 r87933 1 2011-06-02 Andreas Kling <kling@webkit.org> 2 3 Reviewed by James Robinson. 4 5 Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color. 6 https://bugs.webkit.org/show_bug.cgi?id=61944 7 8 * platform/chromium/test_expectations.txt: Unskip canvas/philip/tests/2d.fillStyle.parse.system.html. 9 1 10 2011-06-02 Dimitri Glazkov <dglazkov@chromium.org> 2 11 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r87929 r87933 2009 2009 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-atop.html = TEXT 2010 2010 BUGWK39177 : canvas/philip/tests/2d.composite.uncovered.pattern.destination-in.html = TEXT 2011 BUGWK39168 : canvas/philip/tests/2d.fillStyle.parse.system.html = TEXT2012 2011 BUGWK45991 : canvas/philip/tests/2d.pattern.image.undefined.html = TEXT 2013 2012 BUGWK45991 : canvas/philip/tests/2d.text.draw.baseline.bottom.html = TEXT -
trunk/Source/WebCore/ChangeLog
r87932 r87933 1 2011-06-02 Andreas Kling <kling@webkit.org> 2 3 Reviewed by James Robinson. 4 5 Canvas/V8: Fix setting strokeStyle or fillStyle to a CSS system color. 6 https://bugs.webkit.org/show_bug.cgi?id=61944 7 8 Call setFillColor/setStrokeColor (instead of setFillStyle/setStrokeStyle) 9 for string styles. This ensures that system color resolution is performed, 10 and matches what the JSC bindings do. 11 12 Test: canvas/philip/tests/2d.fillStyle.parse.system.html 13 14 * bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp: 15 (WebCore::toCanvasStyle): 16 (WebCore::V8CanvasRenderingContext2D::strokeStyleAccessorSetter): 17 (WebCore::V8CanvasRenderingContext2D::fillStyleAccessorSetter): 18 1 19 2011-06-02 Sheriff Bot <webkit.review.bot@gmail.com> 2 20 -
trunk/Source/WebCore/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp
r65613 r87933 63 63 static PassRefPtr<CanvasStyle> toCanvasStyle(v8::Handle<v8::Value> value) 64 64 { 65 if (value->IsString())66 return CanvasStyle::createFromString(toWebCoreString(value));67 68 65 if (V8CanvasGradient::HasInstance(value)) 69 66 return CanvasStyle::createFromGradient(V8CanvasGradient::toNative(v8::Handle<v8::Object>::Cast(value))); … … 84 81 { 85 82 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.Holder()); 86 impl->setStrokeStyle(toCanvasStyle(value)); 83 if (value->IsString()) 84 impl->setStrokeColor(toWebCoreString(value)); 85 else 86 impl->setStrokeStyle(toCanvasStyle(value)); 87 87 } 88 88 … … 96 96 { 97 97 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.Holder()); 98 impl->setFillStyle(toCanvasStyle(value)); 98 if (value->IsString()) 99 impl->setFillColor(toWebCoreString(value)); 100 else 101 impl->setFillStyle(toCanvasStyle(value)); 99 102 } 100 103
Note: See TracChangeset
for help on using the changeset viewer.