fix warnings on Mac in src/views
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6300045
git-svn-id: http://skia.googlecode.com/svn/trunk@4176 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/views/animated/SkStaticTextView.cpp b/src/views/animated/SkStaticTextView.cpp
index 2fd04a7..79eecd6 100644
--- a/src/views/animated/SkStaticTextView.cpp
+++ b/src/views/animated/SkStaticTextView.cpp
@@ -150,7 +150,7 @@
void SkStaticTextView::onInflate(const SkDOM& dom, const SkDOM::Node* node)
{
-#if 0
+if (false) { // avoid bit rot, suppress warning
this->INHERITED::onInflate(dom, node);
int index;
@@ -177,8 +177,12 @@
if ((node = dom.getFirstChild(node, "paint")) != NULL &&
(node = dom.getFirstChild(node, "screenplay")) != NULL)
{
+// FIXME: Including inflate_paint causes Windows build to fail -- it complains
+// that SKListView::SkListView is undefined.
+#if 0
inflate_paint(dom, node, &fPaint);
- }
#endif
+ }
+}
}