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

Side by Side Diff: public/web/WebColorSuggestion.h

Issue 23236002: Prepare for color input datalist support on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed Created 7 years, 3 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright 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
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
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 #ifndef WebTextCheckingResult_h 31 #ifndef WebColorSuggestion_h
32 #define WebTextCheckingResult_h 32 #define WebColorSuggestion_h
33 33
34 #include "../platform/WebCommon.h" 34 #include "../platform/WebColor.h"
35 #include "../platform/WebString.h" 35 #include "../platform/WebString.h"
36 #include "WebTextCheckingType.h"
37 36
37 #if INSIDE_WEBKIT
38 #include "core/platform/ColorSuggestion.h"
39 #else
38 namespace WebCore { 40 namespace WebCore {
39 struct TextCheckingResult; 41 class ColorSuggestion;
40 } 42 }
43 #endif
41 44
42 namespace WebKit { 45 namespace WebKit {
43 46
44 // A checked entry of text checking. 47 struct WebColorSuggestion {
45 struct WebTextCheckingResult { 48 WebColor valueAsColor;
46 WebTextCheckingResult() 49 WebString valueAsText;
tkent 2013/08/26 05:34:56 Add comment here too.
47 : type(WebTextCheckingTypeSpelling) 50 WebString label;
48 , location(0) 51
49 , length(0) 52 #if INSIDE_WEBKIT
50 , hash(0) 53 BLINK_COMMON_EXPORT WebColorSuggestion(const WebCore::ColorSuggestion& sugge stion)
54 : valueAsColor(static_cast<WebColor>(suggestion.valueAsColor.rgb()))
55 , valueAsText(suggestion.valueAsText)
56 , label(suggestion.label)
51 { 57 {
52 } 58 }
53 59
54 WebTextCheckingResult(WebTextCheckingType type, int location, int length, co nst WebString& replacement = WebString(), uint32_t hash = 0) 60 BLINK_COMMON_EXPORT WebColorSuggestion& operator=(const WebCore::ColorSugges tion& suggestion)
55 : type(type)
56 , location(location)
57 , length(length)
58 , replacement(replacement)
59 , hash(hash)
60 { 61 {
62 valueAsColor = static_cast<WebColor>(suggestion.valueAsColor.rgb());
63 valueAsText = suggestion.valueAsText;
64 label = suggestion.label;
65 return *this;
61 } 66 }
62
63 #if WEBKIT_IMPLEMENTATION
64 operator WebCore::TextCheckingResult() const;
65 #endif 67 #endif
66
67 WebTextCheckingType type;
68 int location;
69 int length;
70 WebString replacement;
71 uint32_t hash;
72 }; 68 };
73 69
74 } // namespace WebKit 70 } // namespace WebKit
75 71
76 #endif 72 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698