<!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>[189728] trunk/Source</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/189728">189728</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 06:55:10 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Remove create() factory function in EvasGLContext and EvasGLSurface
https://bugs.webkit.org/show_bug.cgi?id=149110
Reviewed by Csaba Osztrogonác.
It is not good implementation we support both create() factory function and public constructor.
In EvasGLContext and EvasGLSurface cases, those have supported both. However create() factory is only
used by EwkView. Thus let's remove the create() function, then EwkView creates EvasGLContext using
std::make_unique<> directly.
Source/WebCore:
* platform/graphics/efl/EvasGLContext.h:
(WebCore::EvasGLContext::create): Deleted.
* platform/graphics/efl/EvasGLSurface.h:
(WebCore::EvasGLSurface::create): Deleted.
Source/WebKit2:
* UIProcess/API/efl/EwkView.cpp:
(EwkView::EwkView):
(EwkView::createGLSurface):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflEvasGLContexth">trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicseflEvasGLSurfaceh">trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflEwkViewcpp">trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189727 => 189728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-14 13:29:22 UTC (rev 189727)
+++ trunk/Source/WebCore/ChangeLog 2015-09-14 13:55:10 UTC (rev 189728)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-09-14 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Remove create() factory function in EvasGLContext and EvasGLSurface
+ https://bugs.webkit.org/show_bug.cgi?id=149110
+
+ Reviewed by Csaba Osztrogonác.
+
+ It is not good implementation we support both create() factory function and public constructor.
+ In EvasGLContext and EvasGLSurface cases, those have supported both. However create() factory is only
+ used by EwkView. Thus let's remove the create() function, then EwkView creates EvasGLContext using
+ std::make_unique<> directly.
+
+ * platform/graphics/efl/EvasGLContext.h:
+ (WebCore::EvasGLContext::create): Deleted.
+ * platform/graphics/efl/EvasGLSurface.h:
+ (WebCore::EvasGLSurface::create): Deleted.
+
</ins><span class="cx"> 2015-09-09 Sergio Villar Senin <svillar@igalia.com>
</span><span class="cx">
</span><span class="cx"> min-width/height should default to auto for grid items
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflEvasGLContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h (189727 => 189728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h 2015-09-14 13:29:22 UTC (rev 189727)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLContext.h 2015-09-14 13:55:10 UTC (rev 189728)
</span><span class="lines">@@ -32,17 +32,6 @@
</span><span class="cx">
</span><span class="cx"> class EvasGLContext {
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<EvasGLContext> create(Evas_GL* evasGL)
- {
- ASSERT(evasGL);
- Evas_GL_Context* context = evas_gl_context_create(evasGL, 0);
- if (!context)
- return nullptr;
-
- // Ownership of context is passed to EvasGLContext.
- return std::make_unique<EvasGLContext>(evasGL, context);
- }
-
</del><span class="cx"> EvasGLContext(Evas_GL*, Evas_GL_Context* passContext);
</span><span class="cx"> ~EvasGLContext();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicseflEvasGLSurfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h (189727 => 189728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h 2015-09-14 13:29:22 UTC (rev 189727)
+++ trunk/Source/WebCore/platform/graphics/efl/EvasGLSurface.h 2015-09-14 13:55:10 UTC (rev 189728)
</span><span class="lines">@@ -34,24 +34,6 @@
</span><span class="cx">
</span><span class="cx"> class EvasGLSurface {
</span><span class="cx"> public:
</span><del>- static std::unique_ptr<EvasGLSurface> create(Evas_GL* evasGL, Evas_GL_Config* cfg, const WebCore::IntSize& size)
- {
- ASSERT(evasGL);
- ASSERT(cfg);
-
- Evas_GL_Surface* surface = 0;
-
- // Ensure that the surface is created with valid size.
- if (size.width() && size.height())
- surface = evas_gl_surface_create(evasGL, cfg, size.width(), size.height());
-
- if (!surface)
- return nullptr;
-
- // Ownership of surface is passed to EvasGLSurface.
- return std::make_unique<EvasGLSurface>(evasGL, surface);
- }
-
</del><span class="cx"> EvasGLSurface(Evas_GL*, Evas_GL_Surface* passSurface);
</span><span class="cx"> ~EvasGLSurface();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (189727 => 189728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-14 13:29:22 UTC (rev 189727)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-14 13:55:10 UTC (rev 189728)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-14 Gyuyoung Kim <gyuyoung.kim@webkit.org>
+
+ [EFL] Remove create() factory function in EvasGLContext and EvasGLSurface
+ https://bugs.webkit.org/show_bug.cgi?id=149110
+
+ Reviewed by Csaba Osztrogonác.
+
+ It is not good implementation we support both create() factory function and public constructor.
+ In EvasGLContext and EvasGLSurface cases, those have supported both. However create() factory is only
+ used by EwkView. Thus let's remove the create() function, then EwkView creates EvasGLContext using
+ std::make_unique<> directly.
+
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::EwkView):
+ (EwkView::createGLSurface):
+
</ins><span class="cx"> 2015-09-13 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove all uses of PassRefPtr in crypto, storage, and history
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (189727 => 189728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-09-14 13:29:22 UTC (rev 189727)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2015-09-14 13:55:10 UTC (rev 189728)
</span><span class="lines">@@ -314,9 +314,16 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Consider it to move into EvasGLContext.
</span><span class="cx"> m_evasGL = evas_gl_new(evas_object_evas_get(m_evasObject));
</span><del>- if (m_evasGL)
- m_evasGLContext = EvasGLContext::create(m_evasGL);
</del><ins>+ if (m_evasGL) {
+ Evas_GL_Context* context = evas_gl_context_create(m_evasGL, 0);
+ if (!context) {
+ WARN("Failed to create Evas_GL_Context. EwkView is not created.");
+ return;
+ }
</ins><span class="cx">
</span><ins>+ m_evasGLContext = std::make_unique<EvasGLContext>(m_evasGL, context);
+ }
+
</ins><span class="cx"> if (!m_evasGLContext) {
</span><span class="cx"> WARN("Failed to create Evas_GL, falling back to software mode.");
</span><span class="cx"> m_isAccelerated = false;
</span><span class="lines">@@ -838,7 +845,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Recreate to current size: Replaces if non-null, and frees existing surface after (OwnPtr).
</span><del>- m_evasGLSurface = EvasGLSurface::create(m_evasGL, &evasGLConfig, deviceSize());
</del><ins>+ if (deviceSize().width() && deviceSize().height()) {
+ Evas_GL_Surface* surface = nullptr;
+ surface = evas_gl_surface_create(m_evasGL, &evasGLConfig, deviceSize().width(), deviceSize().height());
+ if (!surface)
+ return false;
+
+ m_evasGLSurface = std::make_unique<EvasGLSurface>(m_evasGL, surface);
+ }
+
</ins><span class="cx"> if (!m_evasGLSurface)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>