Addressed more Windows compiler complaint issues
http://codereview.appspot.com/6007056/
git-svn-id: http://skia.googlecode.com/svn/trunk@3689 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp
index d12582a..27fc8c6 100644
--- a/experimental/Debugger/DebuggerContentView.cpp
+++ b/experimental/Debugger/DebuggerContentView.cpp
@@ -5,7 +5,7 @@
static const char gIsDebuggerQuery[] = "is-debugger";
class DebuggerView : public SampleView {
public:
- DebuggerView(const char* data, size_t size) {
+ DebuggerView(const char* data, size_t size) {
fData.append(size, data);
fCommandsVisible = true;
fCommandsResizing = false;
@@ -192,7 +192,8 @@
fStateResizing = true;
}
else if (curr.fX < fCommands->width()) {
- fAtomsToRead = fCommands->selectHighlight(curr.fY);
+ fAtomsToRead = fCommands->selectHighlight(
+ SkScalarFloorToInt(curr.fY));
}
else
handled = false;
@@ -232,8 +233,8 @@
this->INHERITED::onSizeChange();
fCommands->setSize(CMD_WIDTH, this->height());
fCommands->setLoc(0, 0);
- fState->setSize(this->width() - CMD_WIDTH, INFO_HEIGHT);
- fState->setLoc(CMD_WIDTH, this->height() - INFO_HEIGHT);
+ fState->setSize(this->width() - CMD_WIDTH, SkFloatToScalar(INFO_HEIGHT));
+ fState->setLoc(CMD_WIDTH, this->height() - SkFloatToScalar(INFO_HEIGHT));
}
private: