Modified: trunk/Source/WebKit2/ChangeLog (159892 => 159893)
--- trunk/Source/WebKit2/ChangeLog 2013-12-01 03:33:39 UTC (rev 159892)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-01 03:52:23 UTC (rev 159893)
@@ -1,3 +1,17 @@
+2013-11-30 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r159865.
+ http://trac.webkit.org/changeset/159865
+ https://bugs.webkit.org/show_bug.cgi?id=125037
+
+ the position of mouse events are wrong at MiniBrowser/efl
+ (Requested by ryuan on #webkit).
+
+ * UIProcess/API/efl/EwkView.cpp:
+ (EwkView::displayTimerFired):
+ (EwkView::createGLSurface):
+ (EwkView::handleEvasObjectCalculate):
+
2013-11-30 Sam Weinig <[email protected]>
[CTTE] The WebPageProxy's WebBackForwardList is never null so it should be stored in a Ref
Modified: trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp (159892 => 159893)
--- trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-12-01 03:33:39 UTC (rev 159892)
+++ trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp 2013-12-01 03:52:23 UTC (rev 159893)
@@ -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, 0, 0, sd->view.w, sd->view.h);
+ evas_object_image_data_update_add(sd->image, sd->view.x, sd->view.y, sd->view.w, sd->view.h);
}
void EwkView::scheduleUpdateDisplay()
@@ -818,11 +818,8 @@
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, viewSize);
+ m_evasGLSurface = EvasGLSurface::create(m_evasGL.get(), &evasGLConfig, deviceSize());
if (!m_evasGLSurface)
return false;
@@ -834,7 +831,8 @@
Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get());
- gl->glViewport(0, 0, viewSize.width(), viewSize.height());
+ WKPoint boundsEnd = WKViewUserViewportToScene(wkView(), WKPointMake(deviceSize().width(), deviceSize().height()));
+ gl->glViewport(0, 0, boundsEnd.x, boundsEnd.y);
gl->glClearColor(1.0, 1.0, 1.0, 0);
gl->glClear(GL_COLOR_BUFFER_BIT);
@@ -1196,6 +1194,7 @@
smartData->view.x = x;
smartData->view.y = y;
evas_object_move(smartData->image, x, y);
+ WKViewSetUserViewportTranslation(self->wkView(), x, y);
}
if (smartData->changed.size) {
