Skip to content
Permalink
Browse files
2011-05-23 Syed Idris Shah <syed.idris-shah@nokia.com>
        Reviewed by Andreas Kling.

        GraphicsContext3DInternal object should be called for getAttachedShaders.
        [Qt] fast/canvas/webgl/gl-object-get-calls.html crash for Qt based webkit
        https://bugs.webkit.org/show_bug.cgi?id=61202

        LayoutTests/fast/canvas/webgl/gl-object-get-calls.html

        getAttachedShaders should be called on GraphicsContext3DInternal instance.
        It was left out by mistake.

        * platform/graphics/qt/GraphicsContext3DQt.cpp:
        (WebCore::GraphicsContext3D::getAttachedShaders): GraphicsContext3DInternal instance should be called.

Canonical link: https://commits.webkit.org/76647@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@87059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
webkit-commit-queue committed May 23, 2011
1 parent 85b4e1e commit 6b37ff31acdb88b9c3aba54d1b721fb5f5c656cf
Showing with 17 additions and 1 deletion.
  1. +16 −0 Source/WebCore/ChangeLog
  2. +1 −1 Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp
@@ -1,3 +1,19 @@
2011-05-23 Syed Idris Shah <syed.idris-shah@nokia.com>

Reviewed by Andreas Kling.

GraphicsContext3DInternal object should be called for getAttachedShaders.
[Qt] fast/canvas/webgl/gl-object-get-calls.html crash for Qt based webkit
https://bugs.webkit.org/show_bug.cgi?id=61202

LayoutTests/fast/canvas/webgl/gl-object-get-calls.html

getAttachedShaders should be called on GraphicsContext3DInternal instance.
It was left out by mistake.

* platform/graphics/qt/GraphicsContext3DQt.cpp:
(WebCore::GraphicsContext3D::getAttachedShaders): GraphicsContext3DInternal instance should be called.

2011-05-23 Carlos Garcia Campos <cgarcia@igalia.com>

Unreviewed. Strict PassOwnPtr build fix.
@@ -772,7 +772,7 @@ void GraphicsContext3D::getAttachedShaders(Platform3DObject program, GC3Dsizei m
}

m_internal->m_glWidget->makeCurrent();
getAttachedShaders(program, maxCount, count, shaders);
m_internal->getAttachedShaders(program, maxCount, count, shaders);
}

void GraphicsContext3D::bindAttribLocation(Platform3DObject program, GC3Duint index, const String& name)

0 comments on commit 6b37ff3

Please sign in to comment.