Fix SampleApp BBH shortcut collision.

samplecode/SampleApp.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SampleApp.h"
 
 #include "SkData.h"
 #include "SkCanvas.h"
@@ skipping 1812 matching lines @@
     for (size_t i = 0; i < name->size(); i++) {
         switch (str[i]) {
             case ':': str[i] = '-'; break;
             case '/': str[i] = '-'; break;
             case ' ': str[i] = '_'; break;
             default: break;
         }
     }
 }
 #endif
 

[robertphillips, 2013/12/11 16:23:10]

Is there any more commented out code that tries to use this in other files?

[f(malita), 2013/12/11 16:45:50]

Nope, I checked.

-//extern bool gIgnoreFastBlurRect;
-
 bool SampleWindow::onHandleChar(SkUnichar uni) {
     {
         SkView* view = curr_view(this);
         if (view) {
             SkEvent evt(gCharEvtName);
             evt.setFast32(uni);
             if (view->doQuery(&evt)) {
                 return true;
             }
         }
@@ skipping 22 matching lines @@
             fScrollTestX = fScrollTestY = 0;
         } else {
             fScrollTestX += dx;
             fScrollTestY += dy;
         }
         this->inval(NULL);
         return true;
     }
 
     switch (uni) {
-        case 'b':
-            {
+        case 'B':
             postEventToSink(SkNEW_ARGS(SkEvent, ("PictFileView::toggleBBox")), curr_view(this));
-            this->updateTitle();
+            // Cannot call updateTitle() synchronously, because the toggleBBox event is still in
+            // the queue.

[robertphillips, 2013/12/11 16:23:10]

SkNEW_ARGS?
Shouldn't this be post_event_to_sink everywhere?

[f(malita), 2013/12/11 16:45:50]

Done.
I think in general it's OK to call updateTitle() synchronously (when whatever
state change is affecting the title has already occurred - which is luckily the
case for most part).

It only gets tricky when using the event queue to signal views that they need to
update some state, like this particular case.

[robertphillips, 2013/12/11 16:47:30]

I meant just change the name since it is a global static.

+            postEventToSink(new SkEvent(gUpdateWindowTitleEvtName), this);
             this->inval(NULL);
             break;
-            }
-        case 'B':
-//            gIgnoreFastBlurRect = !gIgnoreFastBlurRect;
-            this->inval(NULL);
-            break;
-
         case 'f':
             // only
             toggleFPS();
             break;
         case 'g':
             fRequestGrabImage = true;
             this->inval(NULL);
             break;
         case 'G':
             gShowGMBounds = !gShowGMBounds;
@@ skipping 723 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }