fill rect batch refactor into separate batches

BUG=skia:

Review URL: https://codereview.chromium.org/1295773003
3 files changed