diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-25 13:35:59 +0200 |
| commit | 79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4 (patch) | |
| tree | 0287b1a69d84492c901e8bc820e635e7133809a0 /Source/ThirdParty | |
| parent | 682ab87480e7757346802ce7f54cfdbdfeb2339e (diff) | |
| download | qtwebkit-79ad030d505ccf79cf10aa9f8189ca3e2f61f6f4.tar.gz | |
Imported WebKit commit c4b613825abd39ac739a47d7b4410468fcef66dc (http://svn.webkit.org/repository/webkit/trunk@121147)
New snapshot that includes Win32 debug build fix (use SVGAllInOne)
Diffstat (limited to 'Source/ThirdParty')
| -rw-r--r-- | Source/ThirdParty/ANGLE/ChangeLog | 11 | ||||
| -rw-r--r-- | Source/ThirdParty/ANGLE/src/compiler/osinclude.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/Source/ThirdParty/ANGLE/ChangeLog b/Source/ThirdParty/ANGLE/ChangeLog index 502920749..47a8da7f4 100644 --- a/Source/ThirdParty/ANGLE/ChangeLog +++ b/Source/ThirdParty/ANGLE/ChangeLog @@ -1,3 +1,14 @@ +2012-06-22 Joshua Netterfield <jnetterfield@rim.com> + + [BlackBerry] Sanitize GLSL code using ANGLE. + + BlackBerry port does not sanitize GLSL code with ANGLE + https://bugs.webkit.org/show_bug.cgi?id=89583 + + Reviewed by Rob Buis. + + * src/compiler/osinclude.h: Recognises QNX as POSIX + 2012-03-26 Dean Jackson <dino@apple.com> Update ANGLE in WebKit diff --git a/Source/ThirdParty/ANGLE/src/compiler/osinclude.h b/Source/ThirdParty/ANGLE/src/compiler/osinclude.h index 9b3acdf2b..9f9393a71 100644 --- a/Source/ThirdParty/ANGLE/src/compiler/osinclude.h +++ b/Source/ThirdParty/ANGLE/src/compiler/osinclude.h @@ -17,7 +17,7 @@ #elif defined(__APPLE__) || defined(__linux__) || \ defined(__FreeBSD__) || defined(__OpenBSD__) || \ defined(__sun) || defined(ANDROID) || \ - defined(__GLIBC__) || defined(__GNU__) + defined(__GLIBC__) || defined(__GNU__) || defined(__QNX__) #define ANGLE_OS_POSIX #else #error Unsupported platform. |