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

Unified Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 9361039: Adds a stub method & classes for those which aren't used in android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_webkitplatformsupport_impl.cc
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index ce8e3d7019696b4f90342d98021a30f55c83779c..063e5cffeb28cf0581222506cac22294c53f0939 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -63,7 +63,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/mac/WebSandboxSupport.h"
#endif
-#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
#include <string>
#include <map>
@@ -116,6 +116,12 @@ class RendererWebKitPlatformSupportImpl::FileUtilities
int mode);
};
+#if defined(OS_ANDROID)
+// WebKit doesn't use WebSandboxSupport on android so we don't need to
+// implement anything here.
+class RendererWebKitPlatformSupportImpl::SandboxSupport {
+};
+#else
class RendererWebKitPlatformSupportImpl::SandboxSupport
: public WebKit::WebSandboxSupport {
public:
@@ -146,6 +152,7 @@ class RendererWebKitPlatformSupportImpl::SandboxSupport
std::map<string16, WebKit::WebFontFamily> unicode_font_families_;
#endif
};
+#endif // defined(OS_ANDROID)
//------------------------------------------------------------------------------
@@ -181,7 +188,12 @@ RendererWebKitPlatformSupportImpl::fileUtilities() {
}
WebKit::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() {
+#if defined(OS_ANDROID)
+ // WebKit doesn't use WebSandboxSupport on android.
+ return NULL;
+#else
return sandbox_support_.get();
+#endif
}
WebKit::WebCookieJar* RendererWebKitPlatformSupportImpl::cookieJar() {
@@ -490,6 +502,12 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont(
return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
}
+#elif defined(OS_ANDROID)
+
+// WebKit doesn't use WebSandboxSupport on android so we don't need to
+// implement anything here. This is cleaner to support than excluding the
+// whole class for android.
+
#elif defined(OS_POSIX)
void
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698