debugger: Make draw command image widget resize

debugger: Make draw command image widget resize

Make draw command image widget resize. The widget was not resizing,
effectively preventing the window from being resized smaller.

Make the rasterized draw command image be proportional to the widget
size. The draw rasterization canvas is still an equilateral rectangle
with dimensions of the smaller side of the widget.

Makes the widget re-rasterize the image only when the draw command
changes, not for each widget paint.

Renames the widget from "image widget" to "draw command geometry
widget".

Makes the background of the image black, similar to the raster widget
background.

Adds a tooltip saying "Command geometry" for the widget, so that user might
understand what the contents should be.

This commit is part of work that tries to make the debugger window to be
a bit more resizeable, so that it would fit 1900x1200 screen.

Committed: https://skia.googlesource.com/skia/+/63a470227beed0de553d769724e0108808391e42

[Kimmo Kinnunen, 2014-12-30 13:04:57]

kkinnunen@nvidia.com changed reviewers:
+ robertphillips@google.com

[robertphillips, 2014-12-30 17:35:34]

lgtm + nits

Note that this does have the unfortunate side effect of shrinking the auxiliary
image's size for those with extra screen real estate.

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDebuggerGU...
File debugger/QT/SkDebuggerGUI.cpp (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDebuggerGU...
debugger/QT/SkDebuggerGUI.cpp:608: 
one line ?

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
File debugger/QT/SkDrawGeometryWidget.cpp (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.cpp:2: /*
2014

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.cpp:28:
fSurface.reset(SkSurface::NewRaster(info));
this->

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
File debugger/QT/SkDrawGeometryWidget.h (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.h:1: /*
2014

[Kimmo Kinnunen, 2014-12-31 06:43:30]

> Note that this does have the unfortunate side effect of shrinking the
auxiliary
> image's size for those with extra screen real estate.

Reverted the changes to the geometry widget size.

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDebuggerGU...
File debugger/QT/SkDebuggerGUI.cpp (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDebuggerGU...
debugger/QT/SkDebuggerGUI.cpp:608: 
On 2014/12/30 17:35:33, robertphillips wrote:
> one line ?

Done.

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
File debugger/QT/SkDrawGeometryWidget.cpp (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.cpp:2: /*
On 2014/12/30 17:35:33, robertphillips wrote:
> 2014

Done.

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.cpp:28:
fSurface.reset(SkSurface::NewRaster(info));
On 2014/12/30 17:35:33, robertphillips wrote:
> this->

Done.

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
File debugger/QT/SkDrawGeometryWidget.h (right):

https://codereview.chromium.org/787143004/diff/20001/debugger/QT/SkDrawGeomet...
debugger/QT/SkDrawGeometryWidget.h:1: /*
On 2014/12/30 17:35:33, robertphillips wrote:
> 2014

Done.

[Kimmo Kinnunen, 2014-12-31 06:45:14]

The CQ bit was checked by kkinnunen@nvidia.com

[commit-bot: I haz the power, 2014-12-31 06:45:26]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/787143004/40001

[commit-bot: I haz the power, 2014-12-31 06:45:28]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-12-31 06:45:29]

Failed to apply patch for debugger/QT/SkDebuggerGUI.cpp:
While running git apply --index -3 -p1;
  error: patch failed: debugger/QT/SkDebuggerGUI.cpp:107
  Falling back to three-way merge...
  Applied patch to 'debugger/QT/SkDebuggerGUI.cpp' with conflicts.
  U debugger/QT/SkDebuggerGUI.cpp

Patch:       debugger/QT/SkDebuggerGUI.cpp
Index: debugger/QT/SkDebuggerGUI.cpp
diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp
index
400bdf8641d1df1a7b00e11c38d375e73abbef43..14f54177ba44baa50870e4522347f310897f1b47
100644
--- a/debugger/QT/SkDebuggerGUI.cpp
+++ b/debugger/QT/SkDebuggerGUI.cpp
@@ -61,7 +61,7 @@ SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
     , fListWidget(&fCentralSplitter)
     , fDirectoryWidget(&fCentralSplitter)
     , fCanvasWidget(this, &fDebugger)
-    , fImageWidget(&fDebugger)
+    , fDrawCommandGeometryWidget(&fDebugger)
     , fMenuBar(this)
     , fMenuFile(this)
     , fMenuNavigate(this)
@@ -107,6 +107,8 @@ SkDebuggerGUI::SkDebuggerGUI(QWidget *parent) :
     connect(&fCanvasWidget, SIGNAL(hitChanged(int)), this,
SLOT(updateHit(int)));
     connect(&fCanvasWidget, SIGNAL(scaleFactorChanged(float)), this,
SLOT(actionScale(float)));
     connect(&fCanvasWidget, SIGNAL(commandChanged(int)), this,
SLOT(updateCommand(int)));
+    connect(&fCanvasWidget, SIGNAL(commandChanged(int)),
&fDrawCommandGeometryWidget, SLOT(updateImage()));
+
     connect(&fActionSaveAs, SIGNAL(triggered()), this, SLOT(actionSaveAs()));
     connect(&fActionSave, SIGNAL(triggered()), this, SLOT(actionSave()));
 
@@ -232,10 +234,8 @@ void SkDebuggerGUI::actionClearDeletes() {
     }
     if (fPause) {
         fCanvasWidget.drawTo(fPausedRow);
-        fImageWidget.draw();
     } else {
         fCanvasWidget.drawTo(fListWidget.currentRow());
-        fImageWidget.draw();
     }
 }
 
@@ -267,10 +267,8 @@ void SkDebuggerGUI::actionDelete() {
 
     if (fPause) {
         fCanvasWidget.drawTo(fPausedRow);
-        fImageWidget.draw();
     } else {
         fCanvasWidget.drawTo(currentRow);
-        fImageWidget.draw();
     }
 }
 
@@ -289,7 +287,7 @@ void SkDebuggerGUI::actionInspector() {
 
     fInspectorWidget.setHidden(newState);
     fViewStateFrame.setHidden(newState);
-    fImageWidget.setHidden(newState);
+    fDrawCommandGeometryWidget.setHidden(newState);
 }
 
 void SkDebuggerGUI::actionPlay() {
@@ -316,7 +314,6 @@ void SkDebuggerGUI::actionVisualizationsChanged() {
     fDebugger.setPathOps(fSettingsWidget.isPathOpsEnabled());
    
fDebugger.highlightCurrentCommand(fSettingsWidget.isVisibilityFilterEnabled());
     fCanvasWidget.drawTo(fListWidget.currentRow());
-    fImageWidget.draw();
 }
 
 void SkDebuggerGUI::actionTextureFilter() {
@@ -418,7 +415,6 @@ void SkDebuggerGUI::pauseDrawing(bool isPaused) {
     fPause = isPaused;
     fPausedRow = fListWidget.currentRow();
     fCanvasWidget.drawTo(fPausedRow);
-    fImageWidget.draw();
 }
 
 void SkDebuggerGUI::registerListClick(QListWidgetItem *item) {
@@ -428,7 +424,6 @@ void SkDebuggerGUI::registerListClick(QListWidgetItem *item)
{
         if (currentRow != -1) {
             if (!fPause) {
                 fCanvasWidget.drawTo(currentRow);
-                fImageWidget.draw();
             }
             const SkTDArray<SkString*> *currInfo =
fDebugger.getCommandInfo(currentRow);
 
@@ -612,8 +607,7 @@ void SkDebuggerGUI::setupUi(QMainWindow *SkDebuggerGUI) {
     fCanvasWidget.setSizePolicy(QSizePolicy::Expanding,
             QSizePolicy::Expanding);
 
-    fImageWidget.setFixedSize(SkImageWidget::kImageWidgetWidth,
-                              SkImageWidget::kImageWidgetHeight);
+    fDrawCommandGeometryWidget.setSizePolicy(QSizePolicy::Expanding,
QSizePolicy::Expanding);
 
     fInspectorWidget.setSizePolicy(QSizePolicy::Expanding,
             QSizePolicy::Expanding);
@@ -625,6 +619,7 @@ void SkDebuggerGUI::setupUi(QMainWindow *SkDebuggerGUI) {
     fViewStateFrame.setFrameStyle(QFrame::Panel);
     fViewStateFrame.setLayout(&fViewStateFrameLayout);
     fViewStateFrameLayout.addWidget(&fViewStateGroup);
+    fViewStateGroup.setSizePolicy(QSizePolicy::Preferred,
QSizePolicy::Expanding);
     fViewStateGroup.setTitle("View");
     fViewStateLayout.addRow("Zoom Level", &fZoomBox);
     fZoomBox.setText("100%");
@@ -647,7 +642,8 @@ void SkDebuggerGUI::setupUi(QMainWindow *SkDebuggerGUI) {
     fViewStateGroup.setLayout(&fViewStateLayout);
     fSettingsAndImageLayout.addWidget(&fViewStateFrame);
 
-    fSettingsAndImageLayout.addWidget(&fImageWidget);
+    fDrawCommandGeometryWidget.setToolTip("Current Command Geometry");
+    fSettingsAndImageLayout.addWidget(&fDrawCommandGeometryWidget);
 
     fLeftColumnSplitter.addWidget(&fListWidget);
     fLeftColumnSplitter.addWidget(&fDirectoryWidget);

[Kimmo Kinnunen, 2014-12-31 06:55:19]

The CQ bit was checked by kkinnunen@nvidia.com

[commit-bot: I haz the power, 2014-12-31 06:55:35]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/787143004/40001

[commit-bot: I haz the power, 2014-12-31 07:03:59]

Committed patchset #3 (id:40001) as
https://skia.googlesource.com/skia/+/63a470227beed0de553d769724e0108808391e42