diff options
| author |  chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-10 14:36:14 +0000 |
|---|---|---|
| committer | chudy@google.com <chudy@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-07-10 14:36:14 +0000 |
| commit | f927f44a29d999726aaa5792ee8a5e0e56bfa127 (patch) | |
| tree | 4b54591742307abdc62820ed35ef3584f4c34443 /debugger | |
| parent | b9ddd4e9f184f4a4545eca69c55ec1ad1ce59170 (diff) | |
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
Diffstat (limited to 'debugger')
| -rw-r--r-- | debugger/QT/SkCanvasWidget.cpp | 4 | ||||
| -rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp index 6b5faa4bec..39fb1f5aad 100644 --- a/debugger/QT/SkCanvasWidget.cpp +++ b/debugger/QT/SkCanvasWidget.cpp @@ -55,12 +55,8 @@ void SkCanvasWidget::resizeEvent(QResizeEvent* event) { fDevice = new SkDevice(fBitmap); fCanvas = new SkCanvas(fDevice); -<<<<<<< HEAD fDebugCanvas->setBounds(event->size().width(), event->size().height()); fDebugCanvas->drawTo(fCanvas, fIndex); -======= - drawTo(fIndex); ->>>>>>> refs/remotes/git-svn this->update(); } diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 78d905baa9..33a7190099 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -72,7 +72,7 @@ SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) : connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this, SLOT(actionScale(float))); connect(fSettingsWidget.getCommandCheckBox(), SIGNAL(stateChanged(int)), - this, SLOT(pauseDrawing(int))); + this, SLOT(pauseDrawing(bool))); connect(&fCanvasWidget, SIGNAL(commandChanged(int)), &fSettingsWidget, SLOT(updateCommand(int))); } |