Commit b80a020b authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159893 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent a6d11cd7
2013-11-30 Commit Queue <commit-queue@webkit.org>
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 <sam@webkit.org> 2013-11-30 Sam Weinig <sam@webkit.org>
[CTTE] The WebPageProxy's WebBackForwardList is never null so it should be stored in a Ref [CTTE] The WebPageProxy's WebBackForwardList is never null so it should be stored in a Ref
......
...@@ -578,7 +578,7 @@ void EwkView::displayTimerFired(Timer<EwkView>*) ...@@ -578,7 +578,7 @@ void EwkView::displayTimerFired(Timer<EwkView>*)
WKViewPaintToCurrentGLContext(wkView()); WKViewPaintToCurrentGLContext(wkView());
#endif #endif
// sd->image is tied to a native surface, which is in the parent's coordinates. // 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() void EwkView::scheduleUpdateDisplay()
...@@ -818,11 +818,8 @@ bool EwkView::createGLSurface() ...@@ -818,11 +818,8 @@ bool EwkView::createGLSurface()
EVAS_GL_MULTISAMPLE_NONE 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). // 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) if (!m_evasGLSurface)
return false; return false;
...@@ -834,7 +831,8 @@ bool EwkView::createGLSurface() ...@@ -834,7 +831,8 @@ bool EwkView::createGLSurface()
Evas_GL_API* gl = evas_gl_api_get(m_evasGL.get()); 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->glClearColor(1.0, 1.0, 1.0, 0);
gl->glClear(GL_COLOR_BUFFER_BIT); gl->glClear(GL_COLOR_BUFFER_BIT);
...@@ -1196,6 +1194,7 @@ void EwkView::handleEvasObjectCalculate(Evas_Object* evasObject) ...@@ -1196,6 +1194,7 @@ void EwkView::handleEvasObjectCalculate(Evas_Object* evasObject)
smartData->view.x = x; smartData->view.x = x;
smartData->view.y = y; smartData->view.y = y;
evas_object_move(smartData->image, x, y); evas_object_move(smartData->image, x, y);
WKViewSetUserViewportTranslation(self->wkView(), x, y);
} }
if (smartData->changed.size) { if (smartData->changed.size) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment