Title: [119228] trunk
- Revision
- 119228
- Author
- [email protected]
- Date
- 2012-06-01 07:23:01 -0700 (Fri, 01 Jun 2012)
Log Message
[EFL] [DRT] editing/execCommand/paste-and-match-style-event.html crashes
https://bugs.webkit.org/show_bug.cgi?id=86961
Patch by Christophe Dumez <[email protected]> on 2012-06-01
Reviewed by Csaba Osztrogonác.
Source/WebKit/efl:
Call ecore_x_init() in ewk_init() to initialize the ecore_x library.
This avoids crashing upong calling WebCore::systemBeep() which uses
ecore_x_bell() internally.
* ewk/ewk_main.cpp:
(ewk_init):
LayoutTests:
Unskip editing/execCommand/paste-and-match-style-event.html now that
it is no longer crashing thanks to ecore_x library init.
* platform/efl/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (119227 => 119228)
--- trunk/LayoutTests/ChangeLog 2012-06-01 14:14:07 UTC (rev 119227)
+++ trunk/LayoutTests/ChangeLog 2012-06-01 14:23:01 UTC (rev 119228)
@@ -1,3 +1,15 @@
+2012-06-01 Christophe Dumez <[email protected]>
+
+ [EFL] [DRT] editing/execCommand/paste-and-match-style-event.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=86961
+
+ Reviewed by Csaba Osztrogonác.
+
+ Unskip editing/execCommand/paste-and-match-style-event.html now that
+ it is no longer crashing thanks to ecore_x library init.
+
+ * platform/efl/test_expectations.txt:
+
2012-06-01 Dan Bernstein <[email protected]>
Layout not updated after setting -webkit-line-clamp to none
Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (119227 => 119228)
--- trunk/LayoutTests/platform/efl/test_expectations.txt 2012-06-01 14:14:07 UTC (rev 119227)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt 2012-06-01 14:23:01 UTC (rev 119228)
@@ -563,8 +563,6 @@
BUGWK84835 : editing/execCommand/findString-diacriticals.html = TEXT
BUGWK84835 : editing/execCommand/indent-paragraphs.html = TEXT
-BUGWK86961 : editing/execCommand/paste-and-match-style-event.html = CRASH
-
// DRT doesn't check for isPrinting().
BUGWK87226 : printing/iframe-print.html = TEXT
BUGWK87226 : printing/media-queries-print.html = MISSING
Modified: trunk/Source/WebKit/efl/ChangeLog (119227 => 119228)
--- trunk/Source/WebKit/efl/ChangeLog 2012-06-01 14:14:07 UTC (rev 119227)
+++ trunk/Source/WebKit/efl/ChangeLog 2012-06-01 14:23:01 UTC (rev 119228)
@@ -1,3 +1,17 @@
+2012-06-01 Christophe Dumez <[email protected]>
+
+ [EFL] [DRT] editing/execCommand/paste-and-match-style-event.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=86961
+
+ Reviewed by Csaba Osztrogonác.
+
+ Call ecore_x_init() in ewk_init() to initialize the ecore_x library.
+ This avoids crashing upong calling WebCore::systemBeep() which uses
+ ecore_x_bell() internally.
+
+ * ewk/ewk_main.cpp:
+ (ewk_init):
+
2012-06-01 Mikhail Pozdnyakov <[email protected]>
[EFL] New signals in ewk_view to enable global history delegate functionality
Modified: trunk/Source/WebKit/efl/ewk/ewk_main.cpp (119227 => 119228)
--- trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-06-01 14:14:07 UTC (rev 119227)
+++ trunk/Source/WebKit/efl/ewk/ewk_main.cpp 2012-06-01 14:23:01 UTC (rev 119228)
@@ -48,6 +48,10 @@
#include <sys/stat.h>
#include <wtf/Threading.h>
+#ifdef HAVE_ECORE_X
+#include <Ecore_X.h>
+#endif
+
static int _ewkInitCount = 0;
/**
@@ -87,6 +91,13 @@
goto error_ecore_evas;
}
+#ifdef HAVE_ECORE_X
+ if (!ecore_x_init(0)) {
+ CRITICAL("could not init ecore_x");
+ goto error_ecore_x;
+ }
+#endif
+
if (!edje_init()) {
CRITICAL("could not init edje.");
goto error_edje;
@@ -100,6 +111,10 @@
return ++_ewkInitCount;
error_edje:
+#ifdef HAVE_ECORE_X
+ ecore_x_shutdown();
+error_ecore_x:
+#endif
ecore_evas_shutdown();
error_ecore_evas:
ecore_shutdown();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
