Chromium Code Reviews| 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 10 matching lines...) Expand all Loading... | |
| 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 Composition_h | 31 #ifndef ServiceWorkerError_h |
| 32 #define Composition_h | 32 #define ServiceWorkerError_h |
| 33 | 33 |
| 34 #include "bindings/v8/ScriptWrappable.h" | 34 #include "core/dom/DOMError.h" |
| 35 #include "public/platform/WebServiceWorkerError.h" | |
| 35 #include "wtf/PassOwnPtr.h" | 36 #include "wtf/PassOwnPtr.h" |
| 36 #include "wtf/text/WTFString.h" | |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 class InputMethodContext; | 40 class ServiceWorkerError { |
| 41 public: | |
| 42 // For CallbackPromiseAdapter | |
| 43 typedef WebKit::WebServiceWorkerError WebType; | |
| 44 static PassRefPtr<DOMError> from(WebType* webErrorRaw) | |
| 45 { | |
| 46 OwnPtr<WebType> webError = adoptPtr(webErrorRaw); | |
| 47 RefPtr<DOMError> error = DOMError::create(getErrorString(webError->error Type), webError->message); | |
| 48 return error; | |
|
abarth-chromium
2013/10/25 15:37:16
error.release()
alecflett
2013/10/25 23:05:33
Done. (I was actually surprised to see the non-rel
| |
| 49 } | |
| 41 | 50 |
| 42 class Composition : public ScriptWrappable { | 51 static String getErrorString(WebKit::WebServiceWorkerError::ErrorType); |
|
abarth-chromium
2013/10/25 15:37:16
getErrorString -> errorString
Can this function b
alecflett
2013/10/25 23:05:33
Done.
| |
| 43 public: | |
| 44 static PassOwnPtr<Composition> create(InputMethodContext*); | |
| 45 ~Composition(); | |
| 46 | |
| 47 void ref(); | |
| 48 void deref(); | |
| 49 | |
| 50 String text() const; | |
| 51 int selectionStart() const; | |
| 52 int selectionEnd() const; | |
| 53 const Vector<unsigned>& getSegments() const; | |
| 54 | 52 |
| 55 private: | 53 private: |
| 56 explicit Composition(InputMethodContext*); | 54 WTF_MAKE_NONCOPYABLE(ServiceWorkerError); |
| 57 | 55 ServiceWorkerError() WTF_DELETED_FUNCTION; |
| 58 InputMethodContext* m_inputMethodContext; | |
| 59 }; | 56 }; |
| 60 | 57 |
| 61 } // namespace WebCore | 58 } // namespace WebCore |
| 62 | 59 |
| 63 #endif // Composition_h | 60 #endif // ServiceWorkerError_h |
| OLD | NEW |