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

Side by Side Diff: content/renderer/renderer_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/renderer/renderer_webkitclient_impl.h" 5 #include "content/renderer/renderer_webkitclient_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/platform_file.h" 10 #include "base/platform_file.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 virtual bool getFileSize(const WebKit::WebString& path, long long& result); 103 virtual bool getFileSize(const WebKit::WebString& path, long long& result);
104 virtual bool getFileModificationTime(const WebKit::WebString& path, 104 virtual bool getFileModificationTime(const WebKit::WebString& path,
105 double& result); 105 double& result);
106 virtual base::PlatformFile openFile(const WebKit::WebString& path, 106 virtual base::PlatformFile openFile(const WebKit::WebString& path,
107 int mode); 107 int mode);
108 }; 108 };
109 109
110 class RendererWebKitClientImpl::SandboxSupport 110 class RendererWebKitClientImpl::SandboxSupport
111 : public WebKit::WebSandboxSupport { 111 : public WebKit::WebSandboxSupport {
112 public: 112 public:
113 virtual ~SandboxSupport() {}
114
113 #if defined(OS_WIN) 115 #if defined(OS_WIN)
114 virtual bool ensureFontLoaded(HFONT); 116 virtual bool ensureFontLoaded(HFONT);
115 #elif defined(OS_MACOSX) 117 #elif defined(OS_MACOSX)
116 // TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 . 118 // TODO(jeremy): Remove once WebKit side of patch lands - crbug.com/72727 .
117 virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out); 119 virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
118 virtual bool loadFont( 120 virtual bool loadFont(
119 NSFont* srcFont, ATSFontContainerRef* container, uint32* fontID); 121 NSFont* srcFont, ATSFontContainerRef* container, uint32* fontID);
120 #elif defined(OS_POSIX) 122 #elif defined(OS_POSIX)
121 virtual WebKit::WebString getFontFamilyForCharacters( 123 virtual WebKit::WebString getFontFamilyForCharacters(
122 const WebKit::WebUChar* characters, 124 const WebKit::WebUChar* characters,
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 } 596 }
595 597
596 //------------------------------------------------------------------------------ 598 //------------------------------------------------------------------------------
597 599
598 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() { 600 WebBlobRegistry* RendererWebKitClientImpl::blobRegistry() {
599 // RenderThread::current can be NULL when running some tests. 601 // RenderThread::current can be NULL when running some tests.
600 if (!blob_registry_.get() && RenderThread::current()) 602 if (!blob_registry_.get() && RenderThread::current())
601 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current())); 603 blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::current()));
602 return blob_registry_.get(); 604 return blob_registry_.get();
603 } 605 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698