Skip to content

Commit 6b37ff3

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
1 parent 85b4e1e commit 6b37ff3

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

Source/WebCore/ChangeLog

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2011-05-23 Syed Idris Shah <syed.idris-shah@nokia.com>
2+
3+
Reviewed by Andreas Kling.
4+
5+
GraphicsContext3DInternal object should be called for getAttachedShaders.
6+
[Qt] fast/canvas/webgl/gl-object-get-calls.html crash for Qt based webkit
7+
https://bugs.webkit.org/show_bug.cgi?id=61202
8+
9+
LayoutTests/fast/canvas/webgl/gl-object-get-calls.html
10+
11+
getAttachedShaders should be called on GraphicsContext3DInternal instance.
12+
It was left out by mistake.
13+
14+
* platform/graphics/qt/GraphicsContext3DQt.cpp:
15+
(WebCore::GraphicsContext3D::getAttachedShaders): GraphicsContext3DInternal instance should be called.
16+
117
2011-05-23 Carlos Garcia Campos <cgarcia@igalia.com>
218

319
Unreviewed. Strict PassOwnPtr build fix.

Source/WebCore/platform/graphics/qt/GraphicsContext3DQt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ void GraphicsContext3D::getAttachedShaders(Platform3DObject program, GC3Dsizei m
772772
}
773773

774774
m_internal->m_glWidget->makeCurrent();
775-
getAttachedShaders(program, maxCount, count, shaders);
775+
m_internal->getAttachedShaders(program, maxCount, count, shaders);
776776
}
777777

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

0 commit comments

Comments
 (0)