Changeset 148277 in webkit

Timestamp:

Apr 12, 2013 7:05:19 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Crash running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=114503

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2013-04-12
Reviewed by Xan Lopez.

Hit an assertion in ~GuardedPointerBase when DRT is
deleted. DumpRenderTree class derives from
BlackBerry::Platform::LayoutTestClient that derives from
BlackBerry::Platform::GuardedPointerBase, so the DRT pointer
should no be released with delete but with
BlackBerry::Platform::deleteGuardedObject().

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPagePrivate::~WebPagePrivate):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/WebPage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -491 +491 @@
 
 #if !defined(PUBLIC_BUILD) || !PUBLIC_BUILD
-    delete m_dumpRenderTree;
+    BlackBerry::Platform::deleteGuardedObject(static_cast<DumpRenderTree*>(m_dumpRenderTree));
     m_dumpRenderTree = 0;
 #endif

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [BlackBerry] Crash running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=114503
+
+        Reviewed by Xan Lopez.
+
+        Hit an assertion in ~GuardedPointerBase when DRT is
+        deleted. DumpRenderTree class derives from
+        BlackBerry::Platform::LayoutTestClient that derives from
+        BlackBerry::Platform::GuardedPointerBase, so the DRT pointer
+        should no be released with delete but with
+        BlackBerry::Platform::deleteGuardedObject().
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPagePrivate::~WebPagePrivate):
+
 2013-04-12  Carlos Garcia Campos  <cgarcia@igalia.com>