Provide filter when there are many options

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 96 matching lines @@
         }
         case kSurfaceCreated: {
             SkASSERT(!skiaAndroidApp->fNativeWindow && message.fNativeWindow);
             skiaAndroidApp->fNativeWindow = message.fNativeWindow;
             auto window_android = (Window_android*)skiaAndroidApp->fWindow;
             window_android->initDisplay(skiaAndroidApp->fNativeWindow);
             ((Window_android*)skiaAndroidApp->fWindow)->paintIfNeeded();
             break;
         }
         case kSurfaceChanged: {
-            SkASSERT(message.fNativeWindow == skiaAndroidApp->fNativeWindow &&
-                     message.fNativeWindow);
+            SkASSERT(message.fNativeWindow);
             int width = ANativeWindow_getWidth(skiaAndroidApp->fNativeWindow);
             int height = ANativeWindow_getHeight(skiaAndroidApp->fNativeWindow);
             auto window_android = (Window_android*)skiaAndroidApp->fWindow;
+            if (message.fNativeWindow != skiaAndroidApp->fNativeWindow) {
+                window_android->onDisplayDestroyed();
+                ANativeWindow_release(skiaAndroidApp->fNativeWindow);
+                skiaAndroidApp->fNativeWindow = message.fNativeWindow;
+                window_android->initDisplay(skiaAndroidApp->fNativeWindow);
+            }
             window_android->setContentRect(0, 0, width, height);
             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;
@@ skipping 128 matching lines @@
     const char* nameChars = env->GetStringUTFChars(stateName, nullptr);
     const char* valueChars = env->GetStringUTFChars(stateValue, nullptr);
     message.stateName = new SkString(nameChars);
     message.stateValue = new SkString(valueChars);
     skiaAndroidApp->postMessage(message);
     env->ReleaseStringUTFChars(stateName, nameChars);
     env->ReleaseStringUTFChars(stateValue, valueChars);
 }
 
 }  // namespace sk_app