Remove SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS

content/shell/renderer/test_runner/test_runner.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/renderer/test_runner/test_runner.h"
 
 #include <limits>
 
 #include "base/logging.h"
 #include "content/shell/common/test_runner/test_preferences.h"
@@ skipping 2913 matching lines @@
       web_view_->mainFrame()->mainWorldScriptContext();
   if (context.IsEmpty())
     return;
 
   v8::Context::Scope context_scope(context);
   v8::Local<v8::Value> argv[3];
   SkAutoLockPixels snapshot_lock(snapshot);
 
   // Size can be 0 for cases where copyImageAt was called on position
   // that doesn't have an image.
-  int width = snapshot.info().fWidth;
+  int width = snapshot.info().width();
   argv[0] = v8::Number::New(isolate, width);
 
-  int height = snapshot.info().fHeight;
+  int height = snapshot.info().height();
   argv[1] = v8::Number::New(isolate, height);
 
   blink::WebArrayBuffer buffer =
       blink::WebArrayBuffer::create(snapshot.getSize(), 1);
   memcpy(buffer.data(), snapshot.getPixels(), buffer.byteLength());
 #if (SK_R32_SHIFT == 16) && !SK_B32_SHIFT
   {
     // Skia's internal byte order is BGRA. Must swap the B and R channels in
     // order to provide a consistent ordering to the layout tests.
     unsigned char* pixels = static_cast<unsigned char*>(buffer.data());
@@ skipping 58 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace content