And stop suppressing -Wshadow warnings-as-errors. I plan to enable -Wshadow warnings soon in bug 1272513. layout/svg/SVGTextFrame.cpp:4198:28 [-Wshadow] declaration shadows a local variable layout/svg/nsSVGClipPathFrame.cpp:388:18 [-Wshadow] declaration shadows a local variable layout/svg/nsSVGIntegrationUtils.cpp:562:15 [-Wshadow] declaration shadows a local variable layout/svg/nsSVGIntegrationUtils.cpp:586:26 [-Wshadow] declaration shadows a local variable layout/svg/nsSVGIntegrationUtils.cpp:620:15 [-Wshadow] declaration shadows a local variable

I forget to include one more fix, renaming `target` to `maskTarget`: layout/svg/nsSVGIntegrationUtils.cpp:586:26 [-Wshadow] declaration shadows a local variable

Comment on attachment 8753225 [details] [diff] [review] Wshadow_layout-svg_v2.patch Review of attachment 8753225 [details] [diff] [review]: ----------------------------------------------------------------- r=me, 2 nits: ::: layout/svg/SVGTextFrame.cpp @@ +4176,5 @@ > // Find each rendered run that intersects with the range defined > // by charnum/nchars. > nscoord textLength = 0; > + TextRenderedRunIterator runIt(this, TextRenderedRunIterator::eAllFrames); > + TextRenderedRun run = runIt.Current(); Nit: "runIt" is too easy misread as "Run it!" (since both "run" and "it" are words with completely different meaning from their usage here). Please rename to something like "runIter" (or perhaps "textRunIt"/"textRunIter"). ::: layout/svg/nsSVGIntegrationUtils.cpp @@ +582,5 @@ > aContext.Restore(); > return; > } > > + RefPtr<gfxContext> maskTarget = gfxContext::ForDrawTarget(targetDT); Please rename the local variable "targetDT" to "maskTargetDT", for consistency here. (The variables "target" and "targetDT" are strongly intertwined here, & they seem to intentionally have pretty-much-the-same-name to reflect that relationship.) As a bonus, this will make this "targetDT" variable easier to distinguish from a different targetDT that's declared further down in a different scope. (Not in a shadowing way, but still in an easy-to-confuse way.)

Thanks. I'll update the iterator and targetDT names.