| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 11 matching lines...) Expand all Loading... |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "public/web/WebScriptBindings.h" | 32 #include "WebColorSuggestion.h" |
| 33 | 33 |
| 34 #include "bindings/v8/V8Binding.h" | 34 #include "platform/ColorSuggestion.h" |
| 35 #include "public/platform/WebColor.h" |
| 35 #include "public/platform/WebString.h" | 36 #include "public/platform/WebString.h" |
| 36 | 37 |
| 37 using namespace WebCore; | |
| 38 | |
| 39 namespace blink { | 38 namespace blink { |
| 40 | 39 |
| 41 v8::Local<v8::String> WebScriptBindings::toV8String(const WebString& string, v8:
:Isolate* isolate) | 40 WebColorSuggestion::WebColorSuggestion(const WebCore::ColorSuggestion& suggestio
n) |
| 41 : color(static_cast<WebColor>(suggestion.color.rgb())) |
| 42 , label(suggestion.label) |
| 42 { | 43 { |
| 43 return v8String(string, isolate); | |
| 44 } | 44 } |
| 45 | 45 |
| 46 WebString WebScriptBindings::toWebString(v8::Handle<v8::String> v8String) | 46 WebColorSuggestion& WebColorSuggestion::operator=(const WebCore::ColorSuggestion
& suggestion) |
| 47 { | 47 { |
| 48 return v8StringToWebCoreString<String>(v8String, Externalize); | 48 color = static_cast<WebColor>(suggestion.color.rgb()); |
| 49 label = suggestion.label; |
| 50 return *this; |
| 49 } | 51 } |
| 50 | 52 |
| 51 } // namespace blink | 53 } // namespace blink |
| OLD | NEW |