rearrange paint and frame a bit

Change-Id: I45dd6cf35e0514a679aba2861c858f11a4cf2140
Reviewed-on: https://skia-review.googlesource.com/c/175396
Reviewed-by: Mike Klein <mtklein@google.com>
8 files changed