commit e099bc403ca85be61cf23e67661e6a795fbcc40a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 19 16:26:40 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Mon Nov 19 16:26:40 2012 +0000
tree 2c9015cf6c6867c5affec87889c0a94a336e01cf
parent 808b70f869572b2f2d6660960578ba39eb0d5d73

3 minor fixes for debugger

https://codereview.appspot.com/6842062/



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

debugger/QT/SkDebuggerGUI.cpp

diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index 17f7ce2..20fb5ec 100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -175,8 +175,14 @@
 
         SkASSERT(offset == fCurOffset);
 
+#if defined(SK_BUILD_FOR_WIN32)
+        // CPU timer doesn't work well on Windows
         fTimes[fCurCommand] += fTimer.fWall;
         fTot += fTimer.fWall;
+#else
+        fTimes[fCurCommand] += fTimer.fCpu;
+        fTot += fTimer.fCpu;
+#endif
     }
 
 private:
@@ -566,6 +572,7 @@
                     QIcon::Normal, QIcon::Off);
     fActionProfile.setIcon(profile);
     fActionProfile.setText("Profile");
+    fActionProfile.setDisabled(true);
 
     QIcon inspector;
     inspector.addFile(QString::fromUtf8(":/images/Ico/inspector.png"),
@@ -843,8 +850,8 @@
     // If SkPicturePlayback is compiled w/o SK_PICTURE_PROFILING_STUBS
     // the offset count will always be zero
     SkASSERT(0 == fOffsets.count() || commands->count() == fOffsets.count());
-    if (0 == fOffsets.count()) {
-        fActionProfile.setDisabled(true);
+    if (commands->count() == fOffsets.count()) {
+        fActionProfile.setDisabled(false);
     }
 
     /* fDebugCanvas is reinitialized every load picture. Need it to retain value