Modified: trunk/Source/WebKit2/ChangeLog (159864 => 159865)
--- 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)
@@ -1,3 +1,18 @@
+2013-11-29 Hunseop Jeong <[email protected]>
+
+ [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.
+
2013-11-28 Eunmi Lee <[email protected]>
[CoordinatedGraphics][WK2] Correct wrong usage of m_contentPosition variable in the WebView.
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (159864 => 159865)
--- 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)
@@ -578,7 +578,7 @@
WKViewPaintToCurrentGLContext(wkView());
#endif
// sd->image is tied to a native surface, which is in the parent's coordinates.
- evas_object_image_data_update_add(sd->image, sd->view.x, sd->view.y, sd->view.w, sd->view.h);
+ evas_object_image_data_update_add(sd->image, 0, 0, sd->view.w, sd->view.h);
}
void EwkView::scheduleUpdateDisplay()
@@ -818,8 +818,11 @@
EVAS_GL_MULTISAMPLE_NONE
};
+ Ewk_View_Smart_Data* sd = smartData();
+ IntSize viewSize(sd->view.w, sd->view.h);
+
// Recreate to current size: Replaces if non-null, and frees existing surface after (OwnPtr).
- m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, deviceSize());
+ m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, viewSize);
if (!m_evasGLSurface)
return false;
@@ -831,8 +834,7 @@
Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
- WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
- gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
+ gl->glViewport(0, 0, viewSize.width(), viewSize.height());
gl->glClearColor(1.0, 1.0, 1.0, 0);
gl->glClear(GL_COLOR_BUFFER_BIT);
@@ -1194,7 +1196,6 @@
smartData->view.x = x;
smartData->view.y = y;
evas_object_move(smartData->image, x, y);
- WKViewSetUserViewportTranslation(self->wkView(), x, y);
}
if (smartData->changed.size) {
