Move inval dedup to Window for wider usages.

tools/viewer/sk_app/android/surface_glue_android.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "surface_glue_android.h"
 
 #include <jni.h>
@@ skipping 52 matching lines @@
         delete fApp;
     }
 }
 
 void SkiaAndroidApp::setTitle(const char* title) const {
     jstring titleString = fPThreadEnv->NewStringUTF(title);
     fPThreadEnv->CallVoidMethod(fAndroidApp, fSetTitleMethodID, titleString);
     fPThreadEnv->DeleteLocalRef(titleString);
 }
 
-void SkiaAndroidApp::paintIfNeeded() {
-    if (fNativeWindow && fWindow) {
-        fWindow->onPaint();
-    }
-}
-
 void SkiaAndroidApp::postMessage(const Message& message) const {
     SkDEBUGCODE(auto writeSize =) write(fPipes[1], &message, sizeof(message));
     SkASSERT(writeSize == sizeof(message));
 }
 
 void SkiaAndroidApp::readMessage(Message* message) const {
     SkDEBUGCODE(auto readSize =) read(fPipes[0], message, sizeof(Message));
     SkASSERT(readSize == sizeof(Message));
 }
 
-void SkiaAndroidApp::inval() {
-    SkAutoMutexAcquire ama(fMutex);
-    if (!fIsContentInvalidated) {
-        postMessage(Message(kContentInvalidated));
-        fIsContentInvalidated = true;
-    }
-}
-
 int SkiaAndroidApp::message_callback(int fd, int events, void* data) {
     auto skiaAndroidApp = (SkiaAndroidApp*)data;
     Message message;
     skiaAndroidApp->readMessage(&message);
     SkDebugf("message_callback %d", message.fType);
     SkASSERT(message.fType != kUndefined);
 
     switch (message.fType) {
         case kDestroyApp: {
             delete skiaAndroidApp;
             pthread_exit(nullptr);
             return 0;
         }
         case kContentInvalidated: {
-            SkAutoMutexAcquire ama(skiaAndroidApp->fMutex);
-            skiaAndroidApp->fIsContentInvalidated = false;
-            skiaAndroidApp->paintIfNeeded();
+            ((Window_android*)skiaAndroidApp->fWindow)->paintIfNeeded();
             break;
         }
         case kSurfaceCreated: {
             SkASSERT(!skiaAndroidApp->fNativeWindow && message.fNativeWindow);
             skiaAndroidApp->fNativeWindow = message.fNativeWindow;
             auto window_android = (Window_android*)skiaAndroidApp->fWindow;
             window_android->initDisplay(skiaAndroidApp->fNativeWindow);
-            skiaAndroidApp->paintIfNeeded();
+            ((Window_android*)skiaAndroidApp->fWindow)->paintIfNeeded();
             break;
         }
         case kSurfaceChanged: {
             SkASSERT(message.fNativeWindow == skiaAndroidApp->fNativeWindow &&
                      message.fNativeWindow);
             int width = ANativeWindow_getWidth(skiaAndroidApp->fNativeWindow);
             int height = ANativeWindow_getHeight(skiaAndroidApp->fNativeWindow);
             auto window_android = (Window_android*)skiaAndroidApp->fWindow;
             window_android->setContentRect(0, 0, width, height);
-            skiaAndroidApp->paintIfNeeded();
+            window_android->paintIfNeeded();
             break;
         }
         case kSurfaceDestroyed: {
             if (skiaAndroidApp->fNativeWindow) {
                 auto window_android = (Window_android*)skiaAndroidApp->fWindow;
                 window_android->onDisplayDestroyed();
                 ANativeWindow_release(skiaAndroidApp->fNativeWindow);
                 skiaAndroidApp->fNativeWindow = nullptr;
             }
             break;
@@ skipping 97 matching lines @@
     auto skiaAndroidApp = (SkiaAndroidApp*)handle;
     Message message(kTouched);
     message.fTouchOwner = owner;
     message.fTouchState = state;
     message.fTouchX = x;
     message.fTouchY = y;
     skiaAndroidApp->postMessage(message);
 }
 
 }  // namespace sk_app