<!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>[159865] trunk/Source/WebKit2</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/159865">159865</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-11-29 00:37:31 -0800 (Fri, 29 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] viewport must be same with the size of webview
https://bugs.webkit.org/show_bug.cgi?id=124965
Patch by Hunseop Jeong <hs85.jeong@samsung.com> on 2013-11-29
Reviewed by Gyuyoung Kim.
Currently, size of the viewport is larger than size of webview.
Changed the size of viewport with size of webview, because viewport is translated by wrong calculation.
* UIProcess/API/efl/EwkView.cpp:
(EwkView::displayTimerFired): Changed to use the (0,0).
(EwkView::createGLSurface): Modified to use the viewSize instead of the boundsEnd.
(EwkView::handleEvasObjectCalculate): Removed the WKViewSetUserViewportTranslation.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159864 => 159865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-29 07:51:24 UTC (rev 159864)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-29 08:37:31 UTC (rev 159865)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2013-11-29 Hunseop Jeong <hs85.jeong@samsung.com>
+
+ [EFL] viewport must be same with the size of webview
+ https://bugs.webkit.org/show_bug.cgi?id=124965
+
+ Reviewed by Gyuyoung Kim.
+
+ Currently, size of the viewport is larger than size of webview.
+ Changed the size of viewport with size of webview, because viewport is translated by wrong calculation.
+
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::displayTimerFired): Changed to use the (0,0).
+ (EwkView::createGLSurface): Modified to use the viewSize instead of the boundsEnd.
+ (EwkView::handleEvasObjectCalculate): Removed the WKViewSetUserViewportTranslation.
+
</ins><span class="cx"> 2013-11-28 Eunmi Lee <eunmi15.lee@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics][WK2] Correct wrong usage of m_contentPosition variable in the WebView.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflEwkViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (159864 => 159865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-11-29 07:51:24 UTC (rev 159864)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-11-29 08:37:31 UTC (rev 159865)
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> WKViewPaintToCurrentGLContext(wkView());
</span><span class="cx"> #endif
</span><span class="cx"> // sd->image is tied to a native surface, which is in the parent's coordinates.
</span><del>- evas_object_image_data_update_add(sd->image, sd->view.x, sd->view.y, sd->view.w, sd->view.h);
</del><ins>+ evas_object_image_data_update_add(sd->image, 0, 0, sd->view.w, sd->view.h);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EwkView::scheduleUpdateDisplay()
</span><span class="lines">@@ -818,8 +818,11 @@
</span><span class="cx"> EVAS_GL_MULTISAMPLE_NONE
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+ Ewk_View_Smart_Data* sd = smartData();
+ IntSize viewSize(sd->view.w, sd->view.h);
+
</ins><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.get(), &evasGLConfig, deviceSize());
</del><ins>+ m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, viewSize);
</ins><span class="cx"> if (!m_evasGLSurface)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -831,8 +834,7 @@
</span><span class="cx">
</span><span class="cx"> Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
</span><span class="cx">
</span><del>- WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
- gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
</del><ins>+ gl->glViewport(0, 0, viewSize.width(), viewSize.height());
</ins><span class="cx"> gl->glClearColor(1.0, 1.0, 1.0, 0);
</span><span class="cx"> gl->glClear(GL_COLOR_BUFFER_BIT);
</span><span class="cx">
</span><span class="lines">@@ -1194,7 +1196,6 @@
</span><span class="cx"> smartData->view.x = x;
</span><span class="cx"> smartData->view.y = y;
</span><span class="cx"> evas_object_move(smartData->image, x, y);
</span><del>- WKViewSetUserViewportTranslation(self->wkView(), x, y);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (smartData->changed.size) {
</span></span></pre>
</div>
</div>
</body>
</html>