Remove use of legacy SkFontMgr factories.

content/test/layouttest_support.cc

 // Copyright (c) 2012 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/public/test/layouttest_support.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/callback.h"
@@ skipping 42 matching lines @@
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/icc_profile.h"
 #include "ui/gfx/test/icc_profiles.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/frame_host/popup_menu_helper_mac.h"
 #elif defined(OS_WIN)
 #include "content/child/font_warmup_win.h"
 #include "third_party/WebKit/public/web/win/WebFontRendering.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/ports/SkFontMgr.h"
 #include "third_party/skia/include/ports/SkTypeface_win.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
 
 using blink::WebDeviceMotionData;
 using blink::WebDeviceOrientationData;
 using blink::WebGamepad;
 using blink::WebGamepads;
 using blink::WebRect;
@@ skipping 72 matching lines @@
 
 float GetWindowToViewportScale(RenderWidget* render_widget) {
   blink::WebFloatRect rect(0, 0, 1.0f, 0.0);
   render_widget->convertWindowToViewport(&rect);
   return rect.width;
 }
 
 #if defined(OS_WIN)
 // DirectWrite only has access to %WINDIR%\Fonts by default. For developer
 // side-loading, support kRegisterFontFiles to allow access to additional fonts.
-void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) {
+void RegisterSideloadedTypefaces(sk_sp<SkFontMgr> fontmgr) {

[f(malita), 2017/01/09 15:25:34]

looks like we're not passing a ref here - can this be const sk_sp<SkFontMgr>&?

[bungeman-chromium, 2017/01/09 19:15:28]

I did it this way because previously the caller was leaking because this wasn't
taking ownership. Now that the the one caller of this has a smart pointer in
hand, maybe it should be up to them to handle that and let this just borrow that
ownership. In which case this should just get a non-owning raw pointer.

   std::vector<std::string> files = switches::GetSideloadFontFiles();
   for (std::vector<std::string>::const_iterator i(files.begin());
        i != files.end();
        ++i) {
     SkTypeface* typeface = fontmgr->createFromFile(i->c_str());
     blink::WebFontRendering::addSideloadedFontForTesting(typeface);
   }
 }
 #endif  // OS_WIN
 
@@ skipping 433 matching lines @@
 
 void ForceTextInputStateUpdateForRenderFrame(RenderFrame* frame) {
   if (auto* render_widget =
           static_cast<RenderFrameImpl*>(frame)->GetRenderWidget()) {
     render_widget->UpdateTextInputState(ShowIme::IF_NEEDED,
                                         ChangeSource::FROM_NON_IME);
   }
 }
 
 }  // namespace content