Changeset 159893 in webkit

Timestamp:

Nov 30, 2013 7:52:23 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/efl/EwkView.cpp (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/UIProcess/API/efl/EwkView.cpp

@@ -579 +579 @@
 #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);
 }
 
@@ -819 +819 @@
     };
 
-    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;
@@ -835 +832 @@
     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);
@@ -1197 +1195 @@
         smartData->view.y = y;
         evas_object_move(smartData->image, x, y);
+        WKViewSetUserViewportTranslation(self->wkView(), x, y);
     }