Summary: | [chromium] Pass mask scale and offset to shaders for correct masking | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Shawn Singh <shawnsingh> | ||||||
Component: | Layout and Rendering | Assignee: | Shawn Singh <shawnsingh> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | cc-bugs, dglazkov, enne, jamesr, reveman, webkit.review.bot | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Shawn Singh
2012-08-08 17:15:01 PDT
Created attachment 157345 [details]
Patch
Attachment 157345 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/platform/graphics/chromium/..." exit_code: 1
Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp:697: v_maskTexCoord is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4]
Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp:750: v_maskTexCoord is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4]
Total errors found: 2 in 6 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Few points to make: (1) the style checker will complain, but this seems to fit the style we had for written shaders already. (2) I will be writing layout tests for this, but it's ready for review otherwise. I suspect you guys may have something to say about how we could group these new values into fewer args that get passed around. =) Comment on attachment 157345 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=157345&action=review >> Source/WebCore/platform/graphics/chromium/ShaderChromium.cpp:750 >> + vec2 v_maskTexCoord = vec2(maskTexCoordOffset.x + v_texCoord.x * maskTexCoordScale.x, maskTexCoordOffset.y + v_texCoord.y * maskTexCoordScale.y); > > v_maskTexCoord is incorrectly named. Don't use underscores in your identifier names. [readability/naming/underscores] [4] On second thought, I shouldn't be prefixing this with v_ anyway, so this won't be an issue on the next patch. Comment on attachment 157345 [details] Patch Attachment 157345 [details] did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13452834 Created attachment 157504 [details]
Added layout test and fixed errors
Comment on attachment 157504 [details]
Added layout test and fixed errors
R=me. Nice layout test! Please rebaseline this after landing.
Committed r125193: <http://trac.webkit.org/changeset/125193> |