| Index: content/renderer/renderer_webkitclient_impl.cc
|
| ===================================================================
|
| --- content/renderer/renderer_webkitclient_impl.cc (revision 84549)
|
| +++ content/renderer/renderer_webkitclient_impl.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -61,7 +61,7 @@
|
| #include <map>
|
|
|
| #include "base/synchronization/lock.h"
|
| -#include "content/renderer/renderer_sandbox_support_linux.h"
|
| +#include "content/common/child_process_sandbox_support_linux.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h"
|
| #endif
|
|
|
| @@ -448,16 +448,18 @@
|
| return WebString::fromUTF8(iter->second);
|
|
|
| const std::string family_name =
|
| - renderer_sandbox_support::getFontFamilyForCharacters(characters,
|
| - num_characters,
|
| - preferred_locale);
|
| + child_process_sandbox_support::getFontFamilyForCharacters(
|
| + characters,
|
| + num_characters,
|
| + preferred_locale);
|
| unicode_font_families_.insert(make_pair(key, family_name));
|
| return WebString::fromUTF8(family_name);
|
| }
|
|
|
| void RendererWebKitClientImpl::SandboxSupport::getRenderStyleForStrike(
|
| const char* family, int sizeAndStyle, WebKit::WebFontRenderStyle* out) {
|
| - renderer_sandbox_support::getRenderStyleForStrike(family, sizeAndStyle, out);
|
| + child_process_sandbox_support::getRenderStyleForStrike(family, sizeAndStyle,
|
| + out);
|
| }
|
|
|
| #elif defined(OS_MACOSX)
|
|
|