[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
cmarrin at apple.com
cmarrin at apple.com
Wed Dec 22 12:10:42 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1cc43e6c58eeb295212230ab22daf78e12d7d8bb
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 16 20:19:06 2010 +0000
Fixed a warning in ANGLEWebKitBridge.cpp
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65448 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index 0e7b4d4..e98543f 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -15679,13 +15679,13 @@
B2A015910AF6CD53006BCE0E /* graphics */ = {
isa = PBXGroup;
children = (
- 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */,
- 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */,
B27535290B053814002CE64F /* cg */,
A75E8B7F0E1DE2B0007F2481 /* filters */,
B27535490B053814002CE64F /* mac */,
F4EAF4AB10C74268009100D3 /* opentype */,
49E911B20EF86D27009D0CAF /* transforms */,
+ 490707E41219C04300D90E51 /* ANGLEWebKitBridge.cpp */,
+ 490707E51219C04300D90E51 /* ANGLEWebKitBridge.h */,
A89943270B42338700D7C802 /* BitmapImage.cpp */,
A89943260B42338700D7C802 /* BitmapImage.h */,
B27535380B053814002CE64F /* Color.cpp */,
diff --git a/WebCore/platform/graphics/ANGLEWebKitBridge.cpp b/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
index 3757d77..9a14820 100644
--- a/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
+++ b/WebCore/platform/graphics/ANGLEWebKitBridge.cpp
@@ -61,7 +61,7 @@ bool ANGLEWebKitBridge::validateShaderSource(const char* shaderSource, ANGLEShad
if (shaderType == SHADER_TYPE_VERTEX)
compiler = m_vertexCompiler;
- else if (shaderType == SHADER_TYPE_FRAGMENT)
+ else
compiler = m_fragmentCompiler;
const char* const shaderSourceStrings[] = { shaderSource };
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list