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 81 matching lines @@
     #define FPS_REPEAT_MULTIPLIER   1
 #else
     #define FPS_REPEAT_MULTIPLIER   10
 #endif
 #define FPS_REPEAT_COUNT    (10 * FPS_REPEAT_MULTIPLIER)
 
 static SampleWindow* gSampleWindow;
 
 static bool gShowGMBounds;
 
-static void postEventToSink(SkEvent* evt, SkEventSink* sink) {
+static void post_event_to_sink(SkEvent* evt, SkEventSink* sink) {
     evt->setTargetID(sink->getSinkID())->post();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const char* skip_until(const char* str, const char* skip) {
     if (!str) {
         return NULL;
     }
     return strstr(str, skip);
@@ skipping 904 matching lines @@
     // If another constructor set our dimensions, ensure that our
     // onSizeChange gets called.
     if (this->height() && this->width()) {
         this->onSizeChange();
     }
 
     // can't call this synchronously, since it may require a subclass to
     // to implement, or the caller may need us to have returned from the
     // constructor first. Hence we post an event to ourselves.
 //    this->updateTitle();
-    postEventToSink(new SkEvent(gUpdateWindowTitleEvtName), this);
+    post_event_to_sink(new SkEvent(gUpdateWindowTitleEvtName), this);
 }
 
 SampleWindow::~SampleWindow() {
     delete fPicture;
     delete fPdfCanvas;
     fTypeface->unref();
 
     SkSafeUnref(fDevManager);
 }
 
@@ skipping 786 matching lines @@
         switch (str[i]) {
             case ':': str[i] = '-'; break;
             case '/': str[i] = '-'; break;
             case ' ': str[i] = '_'; break;
             default: break;
         }
     }
 }
 #endif
 
-//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':
-            {
-            postEventToSink(SkNEW_ARGS(SkEvent, ("PictFileView::toggleBBox")), curr_view(this));
-            this->updateTitle();
+        case 'B':
+            post_event_to_sink(SkNEW_ARGS(SkEvent, ("PictFileView::toggleBBox")), curr_view(this));
+            // Cannot call updateTitle() synchronously, because the toggleBBox event is still in
+            // the queue.
+            post_event_to_sink(SkNEW_ARGS(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;
-            postEventToSink(GMSampleView::NewShowSizeEvt(gShowGMBounds),
+            post_event_to_sink(GMSampleView::NewShowSizeEvt(gShowGMBounds),
                             curr_view(this));
             this->inval(NULL);
             break;
         case 'i':
             this->zoomIn();
             break;
         case 'o':
             this->zoomOut();
             break;
         case 'r':
@@ skipping 712 matching lines @@
     SkGraphics::Init();
     SkEvent::Init();
 }
 
 // FIXME: this should be in a header
 void application_term();
 void application_term() {
     SkEvent::Term();
     SkGraphics::Term();
 }