Bug Fix: Pause drawing execution feature works due to fixed typo

Review URL: https://codereview.appspot.com/6349086

git-svn-id: http://skia.googlecode.com/svn/trunk@4505 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
chudy@google.com 2012-07-10 14:36:14 +00:00
parent b9ddd4e9f1
commit f927f44a29
2 changed files with 1 additions and 5 deletions

View File

@ -55,12 +55,8 @@ void SkCanvasWidget::resizeEvent(QResizeEvent* event) {
fDevice = new SkDevice(fBitmap); fDevice = new SkDevice(fBitmap);
fCanvas = new SkCanvas(fDevice); fCanvas = new SkCanvas(fDevice);
<<<<<<< HEAD
fDebugCanvas->setBounds(event->size().width(), event->size().height()); fDebugCanvas->setBounds(event->size().width(), event->size().height());
fDebugCanvas->drawTo(fCanvas, fIndex); fDebugCanvas->drawTo(fCanvas, fIndex);
=======
drawTo(fIndex);
>>>>>>> refs/remotes/git-svn
this->update(); this->update();
} }

View File

@ -72,7 +72,7 @@ SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this, connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this,
SLOT(actionScale(float))); SLOT(actionScale(float)));
connect(fSettingsWidget.getCommandCheckBox(), SIGNAL(stateChanged(int)), connect(fSettingsWidget.getCommandCheckBox(), SIGNAL(stateChanged(int)),
this, SLOT(pauseDrawing(int))); this, SLOT(pauseDrawing(bool)));
connect(&fCanvasWidget, SIGNAL(commandChanged(int)), &fSettingsWidget, connect(&fCanvasWidget, SIGNAL(commandChanged(int)), &fSettingsWidget,
SLOT(updateCommand(int))); SLOT(updateCommand(int)));
} }