Title: [119233] trunk
Revision
119233
Author
[email protected]
Date
2012-06-01 08:38:07 -0700 (Fri, 01 Jun 2012)

Log Message

Unreviewed, rolling out r119228.
http://trac.webkit.org/changeset/119228
https://bugs.webkit.org/show_bug.cgi?id=88098

Caused the EFL debug bot to crash. (Requested by rakuco on
#webkit).

Patch by Sheriff Bot <[email protected]> on 2012-06-01

Source/WebKit/efl:

* ewk/ewk_main.cpp:
(ewk_init):

LayoutTests:

* platform/efl/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (119232 => 119233)


--- trunk/LayoutTests/ChangeLog	2012-06-01 15:34:30 UTC (rev 119232)
+++ trunk/LayoutTests/ChangeLog	2012-06-01 15:38:07 UTC (rev 119233)
@@ -1,3 +1,14 @@
+2012-06-01  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r119228.
+        http://trac.webkit.org/changeset/119228
+        https://bugs.webkit.org/show_bug.cgi?id=88098
+
+        Caused the EFL debug bot to crash. (Requested by rakuco on
+        #webkit).
+
+        * platform/efl/test_expectations.txt:
+
 2012-06-01  Csaba Osztrogonác  <[email protected]>
 
         [Qt] Unreviewed gardening.

Modified: trunk/LayoutTests/platform/efl/test_expectations.txt (119232 => 119233)


--- trunk/LayoutTests/platform/efl/test_expectations.txt	2012-06-01 15:34:30 UTC (rev 119232)
+++ trunk/LayoutTests/platform/efl/test_expectations.txt	2012-06-01 15:38:07 UTC (rev 119233)
@@ -563,6 +563,8 @@
 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 (119232 => 119233)


--- trunk/Source/WebKit/efl/ChangeLog	2012-06-01 15:34:30 UTC (rev 119232)
+++ trunk/Source/WebKit/efl/ChangeLog	2012-06-01 15:38:07 UTC (rev 119233)
@@ -1,3 +1,15 @@
+2012-06-01  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r119228.
+        http://trac.webkit.org/changeset/119228
+        https://bugs.webkit.org/show_bug.cgi?id=88098
+
+        Caused the EFL debug bot to crash. (Requested by rakuco on
+        #webkit).
+
+        * ewk/ewk_main.cpp:
+        (ewk_init):
+
 2012-06-01  Christophe Dumez  <[email protected]>
 
         [EFL] [DRT] editing/execCommand/paste-and-match-style-event.html crashes

Modified: trunk/Source/WebKit/efl/ewk/ewk_main.cpp (119232 => 119233)


--- trunk/Source/WebKit/efl/ewk/ewk_main.cpp	2012-06-01 15:34:30 UTC (rev 119232)
+++ trunk/Source/WebKit/efl/ewk/ewk_main.cpp	2012-06-01 15:38:07 UTC (rev 119233)
@@ -48,10 +48,6 @@
 #include <sys/stat.h>
 #include <wtf/Threading.h>
 
-#ifdef HAVE_ECORE_X
-#include <Ecore_X.h>
-#endif
-
 static int _ewkInitCount = 0;
 
 /**
@@ -91,13 +87,6 @@
         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;
@@ -111,10 +100,6 @@
     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

Reply via email to