diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp b/chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp index 7ebf607407b..ba9f8f166f7 100644 --- a/chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp +++ b/chromium/third_party/WebKit/Source/web/WebIDBKeyRange.cpp @@ -26,9 +26,9 @@ #include "config.h" #include "public/platform/WebIDBKeyRange.h" -#include "public/platform/WebIDBKey.h" #include "modules/indexeddb/IDBKey.h" #include "modules/indexeddb/IDBKeyRange.h" +#include "public/platform/WebIDBKey.h" using namespace WebCore; @@ -42,7 +42,7 @@ void WebIDBKeyRange::assign(const WebIDBKeyRange& other) void WebIDBKeyRange::assign(const WebIDBKey& lower, const WebIDBKey& upper, bool lowerOpen, bool upperOpen) { if (!lower.isValid() && !upper.isValid()) - m_private = 0; + m_private.reset(); else m_private = IDBKeyRange::create(lower, upper, lowerOpen ? IDBKeyRange::LowerBoundOpen : IDBKeyRange::LowerBoundClosed, upperOpen ? IDBKeyRange::UpperBoundOpen : IDBKeyRange::UpperBoundClosed); } @@ -56,14 +56,14 @@ WebIDBKey WebIDBKeyRange::lower() const { if (!m_private.get()) return WebIDBKey::createInvalid(); - return m_private->lower(); + return WebIDBKey(m_private->lower()); } WebIDBKey WebIDBKeyRange::upper() const { if (!m_private.get()) return WebIDBKey::createInvalid(); - return m_private->upper(); + return WebIDBKey(m_private->upper()); } bool WebIDBKeyRange::lowerOpen() const @@ -76,18 +76,18 @@ bool WebIDBKeyRange::upperOpen() const return m_private.get() && m_private->upperOpen(); } -WebIDBKeyRange::WebIDBKeyRange(const PassRefPtr<IDBKeyRange>& value) +WebIDBKeyRange::WebIDBKeyRange(IDBKeyRange* value) : m_private(value) { } -WebIDBKeyRange& WebIDBKeyRange::operator=(const PassRefPtr<IDBKeyRange>& value) +WebIDBKeyRange& WebIDBKeyRange::operator=(IDBKeyRange* value) { m_private = value; return *this; } -WebIDBKeyRange::operator PassRefPtr<IDBKeyRange>() const +WebIDBKeyRange::operator IDBKeyRange*() const { return m_private.get(); } |