Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: content/ppapi_plugin/ppapi_webkitclient_impl.cc

Issue 7087028: roll clang 131935:132017 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/ppapi_plugin/ppapi_webkitclient_impl.h" 5 #include "content/ppapi_plugin/ppapi_webkitclient_impl.h"
6 6
7 #include <map> 7 #include <map>
8 8
9 #include "base/synchronization/lock.h" 9 #include "base/synchronization/lock.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 10 matching lines...) Expand all
21 #include "content/common/child_process_sandbox_support_linux.h" 21 #include "content/common/child_process_sandbox_support_linux.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSuppo rt.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSuppo rt.h"
23 #endif 23 #endif
24 24
25 using WebKit::WebSandboxSupport; 25 using WebKit::WebSandboxSupport;
26 using WebKit::WebString; 26 using WebKit::WebString;
27 using WebKit::WebUChar; 27 using WebKit::WebUChar;
28 28
29 class PpapiWebKitClientImpl::SandboxSupport : public WebSandboxSupport { 29 class PpapiWebKitClientImpl::SandboxSupport : public WebSandboxSupport {
30 public: 30 public:
31 virtual ~SandboxSupport() {}
32
31 #if defined(OS_WIN) 33 #if defined(OS_WIN)
32 virtual bool ensureFontLoaded(HFONT); 34 virtual bool ensureFontLoaded(HFONT);
33 #elif defined(OS_MACOSX) 35 #elif defined(OS_MACOSX)
34 virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out); 36 virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
35 #elif defined(OS_POSIX) 37 #elif defined(OS_POSIX)
36 virtual WebString getFontFamilyForCharacters( 38 virtual WebString getFontFamilyForCharacters(
37 const WebUChar* characters, 39 const WebUChar* characters,
38 size_t numCharacters, 40 size_t numCharacters,
39 const char* preferred_locale); 41 const char* preferred_locale);
40 virtual void getRenderStyleForStrike( 42 virtual void getRenderStyleForStrike(
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 } 231 }
230 232
231 WebKit::WebSerializedScriptValue 233 WebKit::WebSerializedScriptValue
232 PpapiWebKitClientImpl::injectIDBKeyIntoSerializedValue( 234 PpapiWebKitClientImpl::injectIDBKeyIntoSerializedValue(
233 const WebKit::WebIDBKey& key, 235 const WebKit::WebIDBKey& key,
234 const WebKit::WebSerializedScriptValue& value, 236 const WebKit::WebSerializedScriptValue& value,
235 const WebKit::WebString& keyPath) { 237 const WebKit::WebString& keyPath) {
236 NOTREACHED(); 238 NOTREACHED();
237 return WebKit::WebSerializedScriptValue(); 239 return WebKit::WebSerializedScriptValue();
238 } 240 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698