commit | d6176b0dcacb124539e0cfd051e6d93a9782f020 | [log] [tgz] |
---|---|---|
author | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Aug 23 18:14:13 2012 +0000 |
committer | rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Aug 23 18:14:13 2012 +0000 |
tree | 9e6f4b465e54c9b26e1ba70cd8890b55abb08464 | |
parent | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 [diff] [blame] |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/) This CL is part II of IV (I broke down the 1280 files into 4 CLs). Review URL: https://codereview.appspot.com/6474054 git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/animator/SkDisplayBounds.cpp b/src/animator/SkDisplayBounds.cpp index 69ec47e..4c89481b9 100644 --- a/src/animator/SkDisplayBounds.cpp +++ b/src/animator/SkDisplayBounds.cpp
@@ -36,7 +36,7 @@ maker.fDisplayList.fHasUnion = true; if (rect.isEmpty()) rect = fBounds; - else + else rect.join(fBounds); } return result;