<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173621] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173621">173621</a></dd>
<dt>Author</dt> <dd>g.czajkowski@samsung.com</dd>
<dt>Date</dt> <dd>2014-09-15 07:45:33 -0700 (Mon, 15 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Ecore and Eina are initialized twice in TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=136822
Reviewed by Gyuyoung Kim.
In TestWebKitAPI/efl/main.cpp, ecore and eina modules are unnecessarily
initialized as we already does it in PlatformWebView::PlatformWebView
calling ewk_init(). The reason for that was to ensure testing for example,
WTF where creating the view is not mandatory.
Call ewk_init() and ewk_shutdown() in TestWebKitAPI/efl/main.cpp
in order to properly initalize and release EWebKit.
* TestWebKitAPI/PlatformEfl.cmake:
* TestWebKitAPI/efl/PlatformWebView.cpp:
(TestWebKitAPI::PlatformWebView::PlatformWebView):
(TestWebKitAPI::PlatformWebView::~PlatformWebView):
* TestWebKitAPI/efl/main.cpp:
(main):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformEflcmake">trunk/Tools/TestWebKitAPI/PlatformEfl.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPIeflPlatformWebViewcpp">trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIeflmaincpp">trunk/Tools/TestWebKitAPI/efl/main.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173620 => 173621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-15 14:20:46 UTC (rev 173620)
+++ trunk/Tools/ChangeLog 2014-09-15 14:45:33 UTC (rev 173621)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-09-15 Grzegorz Czajkowski <g.czajkowski@samsung.com>
+
+ [EFL] Ecore and Eina are initialized twice in TestWebKitAPI
+ https://bugs.webkit.org/show_bug.cgi?id=136822
+
+ Reviewed by Gyuyoung Kim.
+
+ In TestWebKitAPI/efl/main.cpp, ecore and eina modules are unnecessarily
+ initialized as we already does it in PlatformWebView::PlatformWebView
+ calling ewk_init(). The reason for that was to ensure testing for example,
+ WTF where creating the view is not mandatory.
+
+ Call ewk_init() and ewk_shutdown() in TestWebKitAPI/efl/main.cpp
+ in order to properly initalize and release EWebKit.
+
+ * TestWebKitAPI/PlatformEfl.cmake:
+ * TestWebKitAPI/efl/PlatformWebView.cpp:
+ (TestWebKitAPI::PlatformWebView::PlatformWebView):
+ (TestWebKitAPI::PlatformWebView::~PlatformWebView):
+ * TestWebKitAPI/efl/main.cpp:
+ (main):
+
</ins><span class="cx"> 2014-09-15 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Make it easier to enable/disable GStreamer.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformEfl.cmake (173620 => 173621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2014-09-15 14:20:46 UTC (rev 173620)
+++ trunk/Tools/TestWebKitAPI/PlatformEfl.cmake 2014-09-15 14:45:33 UTC (rev 173621)
</span><span class="lines">@@ -36,9 +36,16 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/efl/PlatformWebView.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+list(APPEND test_wtf_LIBRARIES
+ WebKit2
+)
+
+list(APPEND test_webcore_LIBRARIES
+ WebKit2
+)
+
</ins><span class="cx"> list(APPEND TestJavaScriptCore_LIBRARIES
</span><del>- ${ECORE_LIBRARIES}
- ${EINA_LIBRARIES}
</del><ins>+ WebKit2
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> # The list below works like a test expectation. Tests in the
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIeflPlatformWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp (173620 => 173621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2014-09-15 14:20:46 UTC (rev 173620)
+++ trunk/Tools/TestWebKitAPI/efl/PlatformWebView.cpp 2014-09-15 14:45:33 UTC (rev 173621)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx">
</span><span class="cx"> PlatformWebView::PlatformWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
</span><span class="cx"> {
</span><del>- ewk_init();
</del><span class="cx"> m_window = createEcoreEvas();
</span><span class="cx">
</span><span class="cx"> m_view = EWKViewCreate(contextRef, pageGroupRef, ecore_evas_get(m_window), /* smart */ 0);
</span><span class="lines">@@ -83,7 +82,6 @@
</span><span class="cx"> evas_object_del(m_view);
</span><span class="cx">
</span><span class="cx"> ecore_evas_free(m_window);
</span><del>- ewk_shutdown();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::resizeTo(unsigned width, unsigned height)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIeflmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/efl/main.cpp (173620 => 173621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/efl/main.cpp 2014-09-15 14:20:46 UTC (rev 173620)
+++ trunk/Tools/TestWebKitAPI/efl/main.cpp 2014-09-15 14:45:33 UTC (rev 173621)
</span><span class="lines">@@ -26,9 +26,8 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "TestsController.h"
</span><del>-#include <Ecore.h>
-#include <Eina.h>
</del><span class="cx"> #include <getopt.h>
</span><ins>+#include <EWebKit2.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx">
</span><span class="cx"> bool useX11Window = false;
</span><span class="lines">@@ -52,18 +51,14 @@
</span><span class="cx"> WTFInstallReportBacktraceOnCrashHook();
</span><span class="cx"> setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, false);
</span><span class="cx">
</span><del>- if (!eina_init())
</del><ins>+ if (!ewk_init())
</ins><span class="cx"> return EXIT_FAILURE;
</span><span class="cx">
</span><del>- if (!ecore_init())
- return EXIT_FAILURE;
-
</del><span class="cx"> useX11Window = checkForUseX11WindowArgument(argc, argv);
</span><span class="cx">
</span><span class="cx"> int returnCode = TestWebKitAPI::TestsController::shared().run(argc, argv) ? EXIT_SUCCESS : EXIT_FAILURE;
</span><span class="cx">
</span><del>- ecore_shutdown();
- eina_shutdown();
</del><ins>+ ewk_shutdown();
</ins><span class="cx">
</span><span class="cx"> return returnCode;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>