diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 15:50:18 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-16 15:50:18 +0000 |
| commit | 6853e808a464ca75ff1328338d1eb55ff27c4337 (patch) | |
| tree | b87b0d4374b5fd4171fd8eefe4de1c85da65c53a /experimental/Debugger/DebuggerContentView.cpp | |
| parent | 4f8975ea0fdd2127cc2c0611966204b36f1e75ce (diff) | |
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
Diffstat (limited to 'experimental/Debugger/DebuggerContentView.cpp')
| -rw-r--r-- | experimental/Debugger/DebuggerContentView.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/experimental/Debugger/DebuggerContentView.cpp b/experimental/Debugger/DebuggerContentView.cpp index d12582a12a..27fc8c6a2a 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 @@ protected: 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 @@ protected: 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: |