5 files changed, 9 insertions, 21 deletions
diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp
index e4716af439..c560aec3b5 100644
--- a/debugger/QT/SkCanvasWidget.cpp
+++ b/debugger/QT/SkCanvasWidget.cpp
@@ -33,9 +33,7 @@ SkCanvasWidget::SkCanvasWidget() : QWidget()
 }
 
 SkCanvasWidget::~SkCanvasWidget() {
-    if (fDebugCanvas) {
-        delete fDebugCanvas;
-    }
+    delete fDebugCanvas;
 }
 
 void SkCanvasWidget::drawTo(int index) {
@@ -78,13 +76,8 @@ void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) {
 
 void SkCanvasWidget::mousePressEvent(QMouseEvent* event) {
     fPreviousPoint.set(event->globalX(), event->globalY());
-    if (fDebugCanvas) {
-        fDebugCanvas->getBoxClass()->setHitPoint(event->x(), event->y());
-        fDebugCanvas->isCalculatingHits(true);
-        drawTo(fIndex);
-        emit hitChanged(fDebugCanvas->getHitBoxPoint());
-        fDebugCanvas->isCalculatingHits(false);
-    }
+    emit hitChanged(fDebugCanvas->getLayerAtPoint(event->x(), event->y(),
+            fIndex, fTransform, fScaleFactor));
 }
 
 void SkCanvasWidget::mouseDoubleClickEvent(QMouseEvent* event) {
diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp
index 74ed48eb6e..e3c4161cb4 100644
--- a/debugger/QT/SkGLWidget.cpp
+++ b/debugger/QT/SkGLWidget.cpp
@@ -54,8 +54,7 @@ void SkGLWidget::paintGL() {
     } else if (fScaleFactor > 0) {
         canvas.scale(fScaleFactor, fScaleFactor);
     }
-    // TODO(chudy): Remove bitmap arguement.
-    fDebugCanvas->drawTo(&canvas, fIndex+1, NULL);
+    fDebugCanvas->drawTo(&canvas, fIndex);
     canvas.flush();
 }
 
diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h
index 5295f4cd18..76257be3c9 100644
--- a/debugger/QT/SkGLWidget.h
+++ b/debugger/QT/SkGLWidget.h
@@ -29,7 +29,7 @@ public:
 
     void setDebugCanvas(SkDebugCanvas* debugCanvas) {
         fDebugCanvas = debugCanvas;
-        fIndex = debugCanvas->getSize();
+        fIndex = debugCanvas->getSize() - 1;
         this->updateGL();
     }
 
diff --git a/debugger/QT/SkRasterWidget.cpp b/debugger/QT/SkRasterWidget.cpp
index db89de70fe..2cf1f348d0 100644
--- a/debugger/QT/SkRasterWidget.cpp
+++ b/debugger/QT/SkRasterWidget.cpp
@@ -28,12 +28,8 @@ SkRasterWidget::~SkRasterWidget() {
 void SkRasterWidget::resizeEvent(QResizeEvent* event) {
     fBitmap.setConfig(SkBitmap::kARGB_8888_Config, event->size().width(), event->size().height());
     fBitmap.allocPixels();
-    if (fDevice) {
-        delete fDevice;
-    }
-        fDevice = new SkDevice(fBitmap);
-
-
+    delete fDevice;
+    fDevice = new SkDevice(fBitmap);
     this->update();
 }
 
@@ -50,7 +46,7 @@ void SkRasterWidget::paintEvent(QPaintEvent* event) {
 
         fMatrix = canvas.getTotalMatrix();
         fClip = canvas.getTotalClip().getBounds();
-        fDebugCanvas->drawTo(&canvas, fIndex+1, &fBitmap);
+        fDebugCanvas->drawTo(&canvas, fIndex);
 
         QPainter painter(this);
         QStyleOption opt;
diff --git a/debugger/QT/SkRasterWidget.h b/debugger/QT/SkRasterWidget.h
index af65792e77..16928007ad 100644
--- a/debugger/QT/SkRasterWidget.h
+++ b/debugger/QT/SkRasterWidget.h
@@ -31,7 +31,7 @@ public:
 
     void setDebugCanvas(SkDebugCanvas* debugCanvas) {
         fDebugCanvas = debugCanvas;
-        fIndex = debugCanvas->getSize();
+        fIndex = debugCanvas->getSize() - 1;
         this->update();
     }