Changeset 100190 in webkit

Timestamp:

Nov 14, 2011, 2:22:02 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

Intermittent asserts in TextureMapperGL::bindSurface on MiniBrowser startup
​https://bugs.webkit.org/show_bug.cgi?id=72299

Patch by Viatcheslav Ostapenko <​ostapenko.viatcheslav@nokia.com> on 2011-11-14
Reviewed by Noam Rosenthal.

Added check that clipping rect is valid.
Clear GL error that might remain from QT GL operations.
Added GL error assert for scissor test operations.

• UIProcess/API/qt/qquickwebpage.cpp:

(QQuickWebPagePrivate::paintToCurrentGLContext):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebpage.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-14  Viatcheslav Ostapenko  <ostapenko.viatcheslav@nokia.com>
+
+        Intermittent asserts in TextureMapperGL::bindSurface on MiniBrowser startup
+        https://bugs.webkit.org/show_bug.cgi?id=72299
+
+        Reviewed by Noam Rosenthal.
+
+        Added check that clipping rect is valid.
+        Clear GL error that might remain from QT GL operations.
+        Added GL error assert for scissor test operations.
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        (QQuickWebPagePrivate::paintToCurrentGLContext):
+
 2011-11-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp

@@ -211 +211 @@
     QRectF clipRect = q->parentItem()->mapRectToScene(q->parentItem()->boundingRect());
 
+    if (!clipRect.isValid())
+        return;
+
+    // Make sure that no GL error code stays from previous QT operations.
+    glGetError();
+
     glEnable(GL_SCISSOR_TEST);
+    ASSERT(!glGetError());
     const int left = clipRect.left();
     const int width = clipRect.width();
@@ -218 +225 @@
 
     glScissor(left, bottom, width, height);
+    ASSERT(!glGetError());
 
     pageProxy->renderToCurrentGLContext(transform, opacity);
     glDisable(GL_SCISSOR_TEST);
+    ASSERT(!glGetError());
 }