[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:51:48 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dee180e153eeac4820cf54092c1bb1b07afa8ce2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Aug 31 20:32:22 2010 +0000
2010-08-31 Ryuan Choi <ryuan.choi at samsung.com>
Reviewed by Antonio Gomes.
[EFL] crashes while dragging any contents
https://bugs.webkit.org/show_bug.cgi?id=44940
Fix crashes caused by returning newly assigned value instead of adoptRef
value.
* page/efl/EventHandlerEfl.cpp:
(WebCore::EventHandler::createDraggingClipboard):
* platform/efl/ClipboardEfl.cpp:
(WebCore::Editor::newGeneralClipboard):
* platform/efl/ClipboardEfl.h:
(WebCore::ClipboardEfl::create):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66526 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f682fdd..0a5954b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2010-08-31 Ryuan Choi <ryuan.choi at samsung.com>
+
+ Reviewed by Antonio Gomes.
+
+ [EFL] crashes while dragging any contents
+ https://bugs.webkit.org/show_bug.cgi?id=44940
+
+ Fix crashes caused by returning newly assigned value instead of adoptRef
+ value.
+
+ * page/efl/EventHandlerEfl.cpp:
+ (WebCore::EventHandler::createDraggingClipboard):
+ * platform/efl/ClipboardEfl.cpp:
+ (WebCore::Editor::newGeneralClipboard):
+ * platform/efl/ClipboardEfl.h:
+ (WebCore::ClipboardEfl::create):
+
2010-08-31 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/page/efl/EventHandlerEfl.cpp b/WebCore/page/efl/EventHandlerEfl.cpp
index df5c276..acf4343 100644
--- a/WebCore/page/efl/EventHandlerEfl.cpp
+++ b/WebCore/page/efl/EventHandlerEfl.cpp
@@ -110,7 +110,7 @@ bool EventHandler::passWheelEventToWidget(PlatformWheelEvent& event, Widget* wid
PassRefPtr<Clipboard> EventHandler::createDraggingClipboard() const
{
- return new ClipboardEfl(ClipboardWritable, true);
+ return ClipboardEfl::create(ClipboardWritable, true);
}
bool EventHandler::passMousePressEventToSubframe(MouseEventWithHitTestResults& mev, Frame* subframe)
diff --git a/WebCore/platform/efl/ClipboardEfl.cpp b/WebCore/platform/efl/ClipboardEfl.cpp
index caff813..6fc80dc 100644
--- a/WebCore/platform/efl/ClipboardEfl.cpp
+++ b/WebCore/platform/efl/ClipboardEfl.cpp
@@ -29,7 +29,7 @@
namespace WebCore {
PassRefPtr<Clipboard> Editor::newGeneralClipboard(ClipboardAccessPolicy policy, Frame*)
{
- return new ClipboardEfl(policy, false);
+ return ClipboardEfl::create(policy, false);
}
PassRefPtr<Clipboard> Clipboard::create(ClipboardAccessPolicy, DragData*, Frame*)
diff --git a/WebCore/platform/efl/ClipboardEfl.h b/WebCore/platform/efl/ClipboardEfl.h
index d5b17c0..5db2fed 100644
--- a/WebCore/platform/efl/ClipboardEfl.h
+++ b/WebCore/platform/efl/ClipboardEfl.h
@@ -28,7 +28,10 @@ class CachedImage;
class ClipboardEfl : public Clipboard {
public:
- ClipboardEfl(ClipboardAccessPolicy, bool);
+ static PassRefPtr<ClipboardEfl> create(ClipboardAccessPolicy policy, bool forDragging = false)
+ {
+ return adoptRef(new ClipboardEfl(policy, forDragging));
+ }
~ClipboardEfl();
void clearData(const String&);
@@ -53,6 +56,9 @@ public:
virtual bool hasData();
virtual void writePlainText(const WTF::String&);
+
+private:
+ ClipboardEfl(ClipboardAccessPolicy, bool);
};
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list