[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[jorlow at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c110ef5c7d3835594e19a1c942572a3653ca2990
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 17:13:16 2010 +0000

    2010-10-05  Jeremy Orlow  <jorlow at chromium.org>
    
            Reviewed by Nate Chapin.
    
            [Chromium] WebIDBKeyRange should handle null left/right pointers
            https://bugs.webkit.org/show_bug.cgi?id=47247
    
            * src/WebIDBKeyRange.cpp:
            (WebKit::WebIDBKeyRange::assign):
            (WebKit::WebIDBKeyRange::left):
            (WebKit::WebIDBKeyRange::right):
            (WebKit::WebIDBKeyRange::flags):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index a9ec403..54786ee 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Jeremy Orlow  <jorlow at chromium.org>
+
+        Reviewed by Nate Chapin.
+
+        [Chromium] WebIDBKeyRange should handle null left/right pointers
+        https://bugs.webkit.org/show_bug.cgi?id=47247
+
+        * src/WebIDBKeyRange.cpp:
+        (WebKit::WebIDBKeyRange::assign):
+        (WebKit::WebIDBKeyRange::left):
+        (WebKit::WebIDBKeyRange::right):
+        (WebKit::WebIDBKeyRange::flags):
+
 2010-10-06  Tony Chang  <tony at chromium.org>
 
         Unreviewed, rolling out r69202.
diff --git a/WebKit/chromium/src/WebIDBKeyRange.cpp b/WebKit/chromium/src/WebIDBKeyRange.cpp
index 4ce9452..720af5f 100644
--- a/WebKit/chromium/src/WebIDBKeyRange.cpp
+++ b/WebKit/chromium/src/WebIDBKeyRange.cpp
@@ -41,7 +41,10 @@ void WebIDBKeyRange::assign(const WebIDBKeyRange& other)
 
 void WebIDBKeyRange::assign(const WebIDBKey& left, const WebIDBKey& right, unsigned short flags)
 {
-    m_private = IDBKeyRange::create(left, right, flags);
+    if (left.type() == WebIDBKey::InvalidType && right.type() == WebIDBKey::InvalidType)
+        m_private = 0;
+    else
+        m_private = IDBKeyRange::create(left, right, flags);
 }
 
 void WebIDBKeyRange::reset()
@@ -51,16 +54,22 @@ void WebIDBKeyRange::reset()
 
 WebIDBKey WebIDBKeyRange::left() const
 {
+    if (!m_private.get())
+        return WebIDBKey::createInvalid();
     return m_private->left();
 }
 
 WebIDBKey WebIDBKeyRange::right() const
 {
+    if (!m_private.get())
+        return WebIDBKey::createInvalid();
     return m_private->right();
 }
 
 unsigned short WebIDBKeyRange::flags() const
 {
+    if (!m_private.get())
+        return 0;
     return m_private->flags();
 }
 

-- 
WebKit Debian packaging