[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jocelyn.turcotte at nokia.com
jocelyn.turcotte at nokia.com
Wed Dec 22 14:58:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit f8e9324755d135a672071b18e410ed69a8249042
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 26 19:47:41 2010 +0000
2010-10-26 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Fix an assert with QtPixmapInstance creation.
https://bugs.webkit.org/show_bug.cgi?id=48323
This places the newly refcounted QtPixmapInstance in a RefPtr
to prevent an assert on the first ref() call.
* bridge/qt/qt_pixmapruntime.cpp:
(JSC::Bindings::QtPixmapInstance::createPixmapRuntimeObject):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70557 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c80fe1e..98778d8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-26 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ [Qt] Fix an assert with QtPixmapInstance creation.
+ https://bugs.webkit.org/show_bug.cgi?id=48323
+
+ This places the newly refcounted QtPixmapInstance in a RefPtr
+ to prevent an assert on the first ref() call.
+
+ * bridge/qt/qt_pixmapruntime.cpp:
+ (JSC::Bindings::QtPixmapInstance::createPixmapRuntimeObject):
+
2010-10-26 Kenichi Ishibashi <bashi at google.com>
Reviewed by Kent Tamura.
diff --git a/WebCore/bridge/qt/qt_pixmapruntime.cpp b/WebCore/bridge/qt/qt_pixmapruntime.cpp
index b9668fe..1ef20c3 100644
--- a/WebCore/bridge/qt/qt_pixmapruntime.cpp
+++ b/WebCore/bridge/qt/qt_pixmapruntime.cpp
@@ -355,7 +355,7 @@ RuntimeObject* QtPixmapInstance::newRuntimeObject(ExecState* exec)
JSObject* QtPixmapInstance::createPixmapRuntimeObject(ExecState* exec, PassRefPtr<RootObject> root, const QVariant& data)
{
JSLock lock(SilenceAssertionsOnly);
- QtPixmapInstance* instance = new QtPixmapInstance(root, data);
+ RefPtr<QtPixmapInstance> instance = adoptRef(new QtPixmapInstance(root, data));
return instance->createRuntimeObject(exec);
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list