Title: [127464] trunk
- Revision
- 127464
- Author
- [email protected]
- Date
- 2012-09-04 06:32:29 -0700 (Tue, 04 Sep 2012)
Log Message
[EFL] Check if ecore_x is initialised before calling ecore_x_bell to avoid crash
https://bugs.webkit.org/show_bug.cgi?id=86961
Patch by Alexander Shalamov <[email protected]> on 2012-09-04
Reviewed by Kenneth Rohde Christiansen.
Source/WebCore:
Add ecore_x initialisation check before calling ecore_x_bell
to avoid crashes when X server is not running.
* platform/efl/SoundEfl.cpp:
(WebCore::systemBeep):
LayoutTests:
Unskipped two layout tests that were crashing.
* platform/efl/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (127463 => 127464)
--- trunk/LayoutTests/ChangeLog 2012-09-04 13:30:35 UTC (rev 127463)
+++ trunk/LayoutTests/ChangeLog 2012-09-04 13:32:29 UTC (rev 127464)
@@ -1,5 +1,16 @@
2012-09-04 Alexander Shalamov <[email protected]>
+ [EFL] Check if ecore_x is initialised before calling ecore_x_bell to avoid crash
+ https://bugs.webkit.org/show_bug.cgi?id=86961
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Unskipped two layout tests that were crashing.
+
+ * platform/efl/TestExpectations:
+
+2012-09-04 Alexander Shalamov <[email protected]>
+
[EFL][WK2] CSS3 Media Queries functionality is broken
https://bugs.webkit.org/show_bug.cgi?id=95680
Modified: trunk/LayoutTests/platform/efl/TestExpectations (127463 => 127464)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-09-04 13:30:35 UTC (rev 127463)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-09-04 13:32:29 UTC (rev 127464)
@@ -759,10 +759,6 @@
BUGWK86187 : media/media-fullscreen-not-in-document.html = TEXT
BUGWK86187 SKIP : media/media-fullscreen-inline.html = PASS
-// ecore_x library is not initialized and calls to it cause crashes
-BUGWK86961 : editing/execCommand/paste-and-match-style-event.html = CRASH
-BUGWK86961 : fast/dom/shadow/cppevent-in-shadow.html = CRASH
-
// Selection problem in Shadow DOM test (passes on GTK)
BUGWKEFL : fast/dom/shadow/selections-in-shadow.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (127463 => 127464)
--- trunk/Source/WebCore/ChangeLog 2012-09-04 13:30:35 UTC (rev 127463)
+++ trunk/Source/WebCore/ChangeLog 2012-09-04 13:32:29 UTC (rev 127464)
@@ -1,5 +1,18 @@
2012-09-04 Alexander Shalamov <[email protected]>
+ [EFL] Check if ecore_x is initialised before calling ecore_x_bell to avoid crash
+ https://bugs.webkit.org/show_bug.cgi?id=86961
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add ecore_x initialisation check before calling ecore_x_bell
+ to avoid crashes when X server is not running.
+
+ * platform/efl/SoundEfl.cpp:
+ (WebCore::systemBeep):
+
+2012-09-04 Alexander Shalamov <[email protected]>
+
[EFL][WK2] CSS3 Media Queries functionality is broken
https://bugs.webkit.org/show_bug.cgi?id=95680
Modified: trunk/Source/WebCore/platform/efl/SoundEfl.cpp (127463 => 127464)
--- trunk/Source/WebCore/platform/efl/SoundEfl.cpp 2012-09-04 13:30:35 UTC (rev 127463)
+++ trunk/Source/WebCore/platform/efl/SoundEfl.cpp 2012-09-04 13:32:29 UTC (rev 127464)
@@ -39,7 +39,10 @@
void systemBeep()
{
#ifdef HAVE_ECORE_X
- ecore_x_bell(0);
+ if (ecore_x_init(0)) {
+ ecore_x_bell(0);
+ ecore_x_shutdown();
+ }
#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
