commit 1ef80942b3b2414c862eb1e9ae301442b447c089
author Chris Dalton <csmartdalton@google.com> Mon Dec 04 12:01:30 2017 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Dec 04 19:29:51 2017 +0000
tree 27eb42492497d3516a008d1f038ce044d2c16c94
parent 364c4c87c1321625ae961d8f2cf315096ccfd462

turn on extended Clang warnings on Windows too

Plus some small rearrangements of the various warning lists.

Change-Id: Ied58f940341d69ddab971a529fd01b1e96b65641
Reviewed-on: https://skia-review.googlesource.com/67720
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

src/utils/win/SkIStream.cpp

diff --git a/src/utils/win/SkIStream.cpp b/src/utils/win/SkIStream.cpp
index 560a947..161206f 100644
--- a/src/utils/win/SkIStream.cpp
+++ b/src/utils/win/SkIStream.cpp
@@ -153,22 +153,20 @@
         if (!this->fSkStream->rewind()) {
             hr = E_FAIL;
         } else {
-            size_t skipped = this->fSkStream->skip(
-                static_cast<size_t>(liDistanceToMove.QuadPart)
-            );
+            size_t skip = static_cast<size_t>(liDistanceToMove.QuadPart);
+            size_t skipped = this->fSkStream->skip(skip);
             this->fLocation.QuadPart = skipped;
-            if (skipped != liDistanceToMove.QuadPart) {
+            if (skipped != skip) {
                 hr = E_FAIL;
             }
         }
         break;
     }
     case STREAM_SEEK_CUR: {
-        size_t skipped = this->fSkStream->skip(
-            static_cast<size_t>(liDistanceToMove.QuadPart)
-        );
+        size_t skip = static_cast<size_t>(liDistanceToMove.QuadPart);
+        size_t skipped = this->fSkStream->skip(skip);
         this->fLocation.QuadPart += skipped;
-        if (skipped != liDistanceToMove.QuadPart) {
+        if (skipped != skip) {
             hr = E_FAIL;
         }
         break;
@@ -179,9 +177,9 @@
         } else {
             // FIXME: Should not depend on getLength.
             // See https://code.google.com/p/skia/issues/detail?id=1570
-            LONGLONG skip = this->fSkStream->getLength()
-                          + liDistanceToMove.QuadPart;
-            size_t skipped = this->fSkStream->skip(static_cast<size_t>(skip));
+            size_t skip = static_cast<size_t>(this->fSkStream->getLength() +
+                                              liDistanceToMove.QuadPart);
+            size_t skipped = this->fSkStream->skip(skip);
             this->fLocation.QuadPart = skipped;
             if (skipped != skip) {
                 hr = E_FAIL;