Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: Source/bindings/v8/custom/V8CanvasRenderingContext2DCustom.cpp

Issue 237743007: Handle the DOMString case of CRC2D.fillStyle/strokeStyle correctly (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add tests for objects without (explicit) toString. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « LayoutTests/fast/canvas/canvas-fillStyle-strokeStyle-stringification.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 void V8CanvasRenderingContext2D::strokeStyleAttributeGetterCustom(const v8::Prop ertyCallbackInfo<v8::Value>& info) 68 void V8CanvasRenderingContext2D::strokeStyleAttributeGetterCustom(const v8::Prop ertyCallbackInfo<v8::Value>& info)
69 { 69 {
70 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older()); 70 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older());
71 v8SetReturnValue(info, toV8Object(impl->strokeStyle(), info.Holder(), info.G etIsolate())); 71 v8SetReturnValue(info, toV8Object(impl->strokeStyle(), info.Holder(), info.G etIsolate()));
72 } 72 }
73 73
74 void V8CanvasRenderingContext2D::strokeStyleAttributeSetterCustom(v8::Local<v8:: Value> value, const v8::PropertyCallbackInfo<void>& info) 74 void V8CanvasRenderingContext2D::strokeStyleAttributeSetterCustom(v8::Local<v8:: Value> value, const v8::PropertyCallbackInfo<void>& info)
75 { 75 {
76 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older()); 76 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older());
77 if (value->IsString()) 77 if (RefPtr<CanvasStyle> canvasStyle = toCanvasStyle(value, info.GetIsolate() )) {
78 impl->setStrokeColor(toCoreString(value.As<v8::String>())); 78 impl->setStrokeStyle(canvasStyle);
79 else 79 } else {
80 impl->setStrokeStyle(toCanvasStyle(value, info.GetIsolate())); 80 TOSTRING_VOID(V8StringResource<>, colorString, value);
81 impl->setStrokeColor(colorString);
82 }
81 } 83 }
82 84
83 void V8CanvasRenderingContext2D::fillStyleAttributeGetterCustom(const v8::Proper tyCallbackInfo<v8::Value>& info) 85 void V8CanvasRenderingContext2D::fillStyleAttributeGetterCustom(const v8::Proper tyCallbackInfo<v8::Value>& info)
84 { 86 {
85 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older()); 87 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older());
86 v8SetReturnValue(info, toV8Object(impl->fillStyle(), info.Holder(), info.Get Isolate())); 88 v8SetReturnValue(info, toV8Object(impl->fillStyle(), info.Holder(), info.Get Isolate()));
87 } 89 }
88 90
89 void V8CanvasRenderingContext2D::fillStyleAttributeSetterCustom(v8::Local<v8::Va lue> value, const v8::PropertyCallbackInfo<void>& info) 91 void V8CanvasRenderingContext2D::fillStyleAttributeSetterCustom(v8::Local<v8::Va lue> value, const v8::PropertyCallbackInfo<void>& info)
90 { 92 {
91 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older()); 93 CanvasRenderingContext2D* impl = V8CanvasRenderingContext2D::toNative(info.H older());
92 if (value->IsString()) 94 if (RefPtr<CanvasStyle> canvasStyle = toCanvasStyle(value, info.GetIsolate() )) {
93 impl->setFillColor(toCoreString(value.As<v8::String>())); 95 impl->setFillStyle(canvasStyle);
94 else 96 } else {
95 impl->setFillStyle(toCanvasStyle(value, info.GetIsolate())); 97 TOSTRING_VOID(V8StringResource<>, colorString, value);
98 impl->setFillColor(colorString);
99 }
96 } 100 }
97 101
98 } // namespace WebCore 102 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/canvas/canvas-fillStyle-strokeStyle-stringification.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698