Remove unused methods from SkWindow.

I came to this while grepping for deprecated SkBitmap's eraseRGB()
method.

BUG=None
TEST=SampleApp still links
R=reed@google.com, robertphillips@google.com

Review URL: https://codereview.chromium.org/147433002

git-svn-id: http://skia.googlecode.com/svn/trunk@13184 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 29 insertions, 66 deletions

diff --git a/src/views/SkWindow.cpp b/src/views/SkWindow.cpp
index 7a4d71a2c0..5451fca075 100644
--- a/src/views/SkWindow.cpp
+++ b/src/views/SkWindow.cpp
@@ -17,12 +17,12 @@
 #define TEST_BOUNDERx
 
 #include "SkBounder.h"
-class test_bounder : public SkBounder {
+class TestSkBounder : public SkBounder {
 public:
-    test_bounder(const SkBitmap& bm) : fCanvas(bm) {}
+    explicit TestSkBounder(const SkBitmap& bm) : fCanvas(bm) {}
+
 protected:
-    virtual bool onIRect(const SkIRect& r)
-    {
+    virtual bool onIRect(const SkIRect& r) SK_OVERRIDE {
         SkRect    rr;
 
         rr.set(SkIntToScalar(r.fLeft), SkIntToScalar(r.fTop),
@@ -46,8 +46,7 @@ private:
     SkCanvas    fCanvas;
 };
 
-SkWindow::SkWindow() : fFocusView(NULL)
-{
+SkWindow::SkWindow() : fFocusView(NULL) {
     fClicks.reset();
     fWaitingOnInval = false;
 
@@ -60,8 +59,7 @@ SkWindow::SkWindow() : fFocusView(NULL)
     fMatrix.reset();
 }
 
-SkWindow::~SkWindow()
-{
+SkWindow::~SkWindow() {
     fClicks.deleteAll();
     fMenus.deleteAll();
 }
@@ -89,18 +87,15 @@ void SkWindow::postConcat(const SkMatrix& matrix) {
     this->setMatrix(m);
 }
 
-void SkWindow::setConfig(SkBitmap::Config config)
-{
+void SkWindow::setConfig(SkBitmap::Config config) {
     this->resize(fBitmap.width(), fBitmap.height(), config);
 }
 
-void SkWindow::resize(int width, int height, SkBitmap::Config config)
-{
+void SkWindow::resize(int width, int height, SkBitmap::Config config) {
     if (config == SkBitmap::kNo_Config)
         config = fConfig;
 
-    if (width != fBitmap.width() || height != fBitmap.height() || config != fConfig)
-    {
+    if (width != fBitmap.width() || height != fBitmap.height() || config != fConfig) {
         fConfig = config;
         fBitmap.setConfig(config, width, height, 0, kOpaque_SkAlphaType);
         fBitmap.allocPixels();
@@ -110,19 +105,8 @@ void SkWindow::resize(int width, int height, SkBitmap::Config config)
     }
 }
 
-void SkWindow::eraseARGB(U8CPU a, U8CPU r, U8CPU g, U8CPU b)
-{
-    fBitmap.eraseARGB(a, r, g, b);
-}
-
-void SkWindow::eraseRGB(U8CPU r, U8CPU g, U8CPU b)
-{
-    fBitmap.eraseARGB(0xFF, r, g, b);
-}
-
-bool SkWindow::handleInval(const SkRect* localR)
-{
-    SkIRect    ir;
+bool SkWindow::handleInval(const SkRect* localR) {
+    SkIRect ir;
 
     if (localR) {
         SkRect devR;
@@ -159,10 +143,8 @@ void SkWindow::forceInvalAll() {
 extern bool gEnableControlledThrow;
 #endif
 
-bool SkWindow::update(SkIRect* updateArea)
-{
-    if (!fDirtyRgn.isEmpty())
-    {
+bool SkWindow::update(SkIRect* updateArea) {
+    if (!fDirtyRgn.isEmpty()) {
         SkBitmap bm = this->getBitmap();
 
 #if defined(SK_BUILD_FOR_WINCE) && defined(USE_GX_SCREEN)
@@ -190,8 +172,8 @@ bool SkWindow::update(SkIRect* updateArea)
         fDirtyRgn.setEmpty();
 
 #ifdef TEST_BOUNDER
-        test_bounder    b(bm);
-        canvas->setBounder(&b);
+        TestSkBounder bounder(bm);
+        canvas->setBounder(&bounder);
 #endif
 #ifdef SK_SIMULATE_FAILED_MALLOC
         gEnableControlledThrow = true;
@@ -221,8 +203,7 @@ bool SkWindow::update(SkIRect* updateArea)
     return false;
 }
 
-bool SkWindow::handleChar(SkUnichar uni)
-{
+bool SkWindow::handleChar(SkUnichar uni) {
     if (this->onHandleChar(uni))
         return true;
 
@@ -235,8 +216,7 @@ bool SkWindow::handleChar(SkUnichar uni)
     return focus->doEvent(evt);
 }
 
-bool SkWindow::handleKey(SkKey key)
-{
+bool SkWindow::handleKey(SkKey key) {
     if (key == kNONE_SkKey)
         return false;
 
@@ -255,8 +235,7 @@ bool SkWindow::handleKey(SkKey key)
             return true;
     }
 
-    if (key == kUp_SkKey || key == kDown_SkKey)
-    {
+    if (key == kUp_SkKey || key == kDown_SkKey) {
         if (this->moveFocus(key == kUp_SkKey ? kPrev_FocusDirection : kNext_FocusDirection) == NULL)
             this->onSetFocusView(NULL);
         return true;
@@ -264,8 +243,7 @@ bool SkWindow::handleKey(SkKey key)
     return false;
 }
 
-bool SkWindow::handleKeyUp(SkKey key)
-{
+bool SkWindow::handleKeyUp(SkKey key) {
     if (key == kNONE_SkKey)
         return false;
 
@@ -300,15 +278,9 @@ void SkWindow::setTitle(const char title[]) {
     this->onSetTitle(title);
 }
 
-//////////////////////////////////////////////////////////////////////
-
-bool SkWindow::onEvent(const SkEvent& evt)
-{
-    if (evt.isType(SK_EventDelayInval))
-    {
-        SkRegion::Iterator    iter(fDirtyRgn);
-
-        for (; !iter.done(); iter.next())
+bool SkWindow::onEvent(const SkEvent& evt) {
+    if (evt.isType(SK_EventDelayInval)) {
+        for (SkRegion::Iterator iter(fDirtyRgn); !iter.done(); iter.next())
             this->onHandleInval(iter.rect());
         fWaitingOnInval = false;
         return true;
@@ -316,17 +288,14 @@ bool SkWindow::onEvent(const SkEvent& evt)
     return this->INHERITED::onEvent(evt);
 }
 
-bool SkWindow::onGetFocusView(SkView** focus) const
-{
+bool SkWindow::onGetFocusView(SkView** focus) const {
     if (focus)
         *focus = fFocusView;
     return true;
 }
 
-bool SkWindow::onSetFocusView(SkView* focus)
-{
-    if (fFocusView != focus)
-    {
+bool SkWindow::onSetFocusView(SkView* focus) {
+    if (fFocusView != focus) {
         if (fFocusView)
             fFocusView->onFocusChange(false);
         fFocusView = focus;
@@ -336,24 +305,18 @@ bool SkWindow::onSetFocusView(SkView* focus)
     return true;
 }
 
-//////////////////////////////////////////////////////////////////////
-
-void SkWindow::onHandleInval(const SkIRect&)
-{
+void SkWindow::onHandleInval(const SkIRect&) {
 }
 
-bool SkWindow::onHandleChar(SkUnichar)
-{
+bool SkWindow::onHandleChar(SkUnichar) {
     return false;
 }
 
-bool SkWindow::onHandleKey(SkKey)
-{
+bool SkWindow::onHandleKey(SkKey) {
     return false;
 }
 
-bool SkWindow::onHandleKeyUp(SkKey)
-{
+bool SkWindow::onHandleKeyUp(SkKey) {
     return false;
 }