| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 { | 63 { |
| 64 m_private.reset(0); | 64 m_private.reset(0); |
| 65 } | 65 } |
| 66 | 66 |
| 67 bool WebIDBKeyPath::isValid() const | 67 bool WebIDBKeyPath::isValid() const |
| 68 { | 68 { |
| 69 ASSERT(m_private.get()); | 69 ASSERT(m_private.get()); |
| 70 return m_private->isValid(); | 70 return m_private->isValid(); |
| 71 } | 71 } |
| 72 | 72 |
| 73 WebIDBKeyPathType WebIDBKeyPath::keyPathType() const |
| 74 { |
| 75 ASSERT(m_private.get()); |
| 76 return static_cast<WebIDBKeyPathType>(m_private->type()); |
| 77 } |
| 78 |
| 73 WebIDBKeyPath::Type WebIDBKeyPath::type() const | 79 WebIDBKeyPath::Type WebIDBKeyPath::type() const |
| 74 { | 80 { |
| 75 ASSERT(m_private.get()); | 81 ASSERT(m_private.get()); |
| 76 return Type(m_private->type()); | 82 return static_cast<WebIDBKeyPath::Type>(m_private->type()); |
| 77 } | 83 } |
| 78 | 84 |
| 79 | |
| 80 WebVector<WebString> WebIDBKeyPath::array() const | 85 WebVector<WebString> WebIDBKeyPath::array() const |
| 81 { | 86 { |
| 82 ASSERT(m_private.get()); | 87 ASSERT(m_private.get()); |
| 83 ASSERT(m_private->type() == IDBKeyPath::ArrayType); | 88 ASSERT(m_private->type() == IDBKeyPath::ArrayType); |
| 84 return m_private->array(); | 89 return m_private->array(); |
| 85 } | 90 } |
| 86 | 91 |
| 87 WebString WebIDBKeyPath::string() const | 92 WebString WebIDBKeyPath::string() const |
| 88 { | 93 { |
| 89 ASSERT(m_private.get()); | 94 ASSERT(m_private.get()); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 104 return *this; | 109 return *this; |
| 105 } | 110 } |
| 106 | 111 |
| 107 WebIDBKeyPath::operator const WebCore::IDBKeyPath&() const | 112 WebIDBKeyPath::operator const WebCore::IDBKeyPath&() const |
| 108 { | 113 { |
| 109 ASSERT(m_private.get()); | 114 ASSERT(m_private.get()); |
| 110 return *(m_private.get()); | 115 return *(m_private.get()); |
| 111 } | 116 } |
| 112 | 117 |
| 113 } // namespace WebKit | 118 } // namespace WebKit |
| OLD | NEW |