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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 29bb3ce7a70b034d6779eca4d61fe11d4e5da642
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 16:50:55 2010 +0000

    2010-11-09  Balazs Kelemen  <kbalazs at webkit.org>
    
            Reviewed by Csaba Osztrogonác.
    
            [Qt][WK2] ASSERT fail in fast/frames/lots-of-objects.html
            https://bugs.webkit.org/show_bug.cgi?id=49253
    
            * Platform/qt/SharedMemoryQt.cpp:
            (WebKit::SharedMemory::create): Do not assert
            when the attach was unsuccessful but return with 0.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71638 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index cfa281b..2414ed4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,16 @@
 2010-11-09  Balazs Kelemen  <kbalazs at webkit.org>
 
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt][WK2] ASSERT fail in fast/frames/lots-of-objects.html
+        https://bugs.webkit.org/show_bug.cgi?id=49253
+
+        * Platform/qt/SharedMemoryQt.cpp:
+        (WebKit::SharedMemory::create): Do not assert
+        when the attach was unsuccessful but return with 0.
+
+2010-11-09  Balazs Kelemen  <kbalazs at webkit.org>
+
         Reviewed by Andreas Kling.
 
         [Qt][WK2] WebKitTestRunner is dead
diff --git a/WebKit2/Platform/qt/SharedMemoryQt.cpp b/WebKit2/Platform/qt/SharedMemoryQt.cpp
index ca997c5..e5341ec 100644
--- a/WebKit2/Platform/qt/SharedMemoryQt.cpp
+++ b/WebKit2/Platform/qt/SharedMemoryQt.cpp
@@ -125,11 +125,14 @@ PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection p
     if (handle.isNull())
         return 0;
 
-    RefPtr<SharedMemory> sharedMemory(adoptRef(new SharedMemory));
     QSharedMemory* impl = new QSharedMemory(QString(handle.m_key));
     bool attached = impl->attach(accessMode(protection));
-    ASSERT_UNUSED(attached, attached);
+    if (!attached) {
+        delete impl;
+        return 0;
+    }
 
+    RefPtr<SharedMemory> sharedMemory(adoptRef(new SharedMemory));
     sharedMemory->m_impl = impl;
     ASSERT(handle.m_size == impl->size());
     sharedMemory->m_size = handle.m_size;

-- 
WebKit Debian packaging