summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/npapi/plugin_list_mac.mm4
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc4
-rw-r--r--webkit/plugins/ppapi/ppb_graphics_2d_impl.cc7
-rw-r--r--webkit/support/platform_support_mac.mm6
-rw-r--r--webkit/support/test_webkit_client.cc4
-rw-r--r--webkit/tools/test_shell/run_all_tests.cc4
-rw-r--r--webkit/tools/test_shell/test_shell.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_mac.mm12
8 files changed, 21 insertions, 24 deletions
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
index 049fe4d..62e682b 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/plugins/npapi/plugin_list_mac.mm
@@ -7,7 +7,7 @@
#import <Foundation/Foundation.h>
#include "base/file_util.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "base/string_util.h"
@@ -32,7 +32,7 @@ void GetPluginCommonDirectory(std::vector<FilePath>* plugin_dirs,
if (err)
return;
- plugin_dirs->push_back(FilePath(mac_util::PathFromFSRef(ref)));
+ plugin_dirs->push_back(FilePath(base::mac::PathFromFSRef(ref)));
}
// Returns true if the plugin should be prevented from loading.
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 2682ac7..33e05fa 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -54,7 +54,7 @@
#include "webkit/plugins/ppapi/var.h"
#if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#endif
@@ -1139,7 +1139,7 @@ void PluginInstance::DrawSkBitmapToCanvas(
CGImageCreate(
bitmap.width(), bitmap.height(),
8, 32, bitmap.rowBytes(),
- mac_util::GetSystemColorSpace(),
+ base::mac::GetSystemColorSpace(),
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
data_provider, NULL, false, kCGRenderingIntentDefault));
diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc
index 89435ff..a783be4 100644
--- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc
+++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc
@@ -25,7 +25,7 @@
#include "webkit/plugins/ppapi/ppb_image_data_impl.h"
#if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/mac/scoped_cftyperef.h"
#endif
@@ -249,7 +249,8 @@ PPB_Graphics2D_Impl* PPB_Graphics2D_Impl::AsPPB_Graphics2D_Impl() {
return this;
}
-PP_Bool PPB_Graphics2D_Impl::Describe(PP_Size* size, PP_Bool* is_always_opaque) {
+PP_Bool PPB_Graphics2D_Impl::Describe(PP_Size* size,
+ PP_Bool* is_always_opaque) {
size->width = image_data_->width();
size->height = image_data_->height();
*is_always_opaque = PP_FALSE; // TODO(brettw) implement this.
@@ -497,7 +498,7 @@ void PPB_Graphics2D_Impl::Paint(WebKit::WebCanvas* canvas,
CGImageCreate(
backing_bitmap.width(), backing_bitmap.height(),
8, 32, backing_bitmap.rowBytes(),
- mac_util::GetSystemColorSpace(),
+ base::mac::GetSystemColorSpace(),
kCGImageAlphaPremultipliedFirst | kCGBitmapByteOrder32Host,
data_provider, NULL, false, kCGRenderingIntentDefault));
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 0e9000f..55abee1 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -12,7 +12,7 @@
#include "base/base_paths.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/path_service.h"
#include "base/string16.h"
#include "grit/webkit_resources.h"
@@ -104,7 +104,7 @@ void AfterInitialize(bool unit_test_mode) {
// Load a data pack.
g_resource_data_pack = new app::DataPack;
NSString* resource_path =
- [mac_util::MainAppBundle() pathForResource:@"DumpRenderTree"
+ [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree"
ofType:@"pak"];
FilePath resources_pak_path([resource_path fileSystemRepresentation]);
if (!g_resource_data_pack->Load(resources_pak_path)) {
@@ -177,7 +177,7 @@ string16 GetLocalizedString(int message_id) {
static FilePath GetResourcesFilePath() {
FilePath path;
// We assume the application is bundled.
- if (!mac_util::AmIBundled()) {
+ if (!base::mac::AmIBundled()) {
LOG(FATAL) << "Failed to locate resources. The applicaiton is not bundled.";
}
PathService::Get(base::DIR_EXE, &path);
diff --git a/webkit/support/test_webkit_client.cc b/webkit/support/test_webkit_client.cc
index 0360d29..1a78768 100644
--- a/webkit/support/test_webkit_client.cc
+++ b/webkit/support/test_webkit_client.cc
@@ -57,7 +57,7 @@
#elif defined(OS_LINUX)
#include "third_party/WebKit/WebKit/chromium/public/linux/WebThemeEngine.h"
#elif defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#endif
using WebKit::WebScriptController;
@@ -88,7 +88,7 @@ TestWebKitClient::TestWebKitClient(bool unit_test_mode)
FilePath module_path;
if (PathService::Get(base::DIR_MODULE, &module_path)) {
#if defined(OS_MACOSX)
- if (mac_util::AmIBundled())
+ if (base::mac::AmIBundled())
module_path = module_path.DirName().DirName().DirName();
#endif
if (media::InitializeMediaLibrary(module_path))
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 11649ebe..59357df 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -27,7 +27,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#if defined(OS_MACOSX)
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/path_service.h"
#endif
@@ -54,7 +54,7 @@ class TestShellTestSuite : public base::TestSuite {
FilePath path;
PathService::Get(base::DIR_EXE, &path);
path = path.AppendASCII("TestShell.app");
- mac_util::SetOverrideAppBundlePath(path);
+ base::mac::SetOverrideAppBundlePath(path);
#endif
base::TestSuite::Initialize();
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 1243ee7..fea90a3 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -62,10 +62,6 @@
#include "third_party/WebKit/WebKit/chromium/public/WebGeolocationClientMock.h"
#endif
-#if defined(OS_MACOSX)
-#include "base/mac_util.h"
-#endif
-
using WebKit::WebCanvas;
using WebKit::WebFrame;
using WebKit::WebNavigationPolicy;
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index f05089c..6cd810d 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -17,7 +17,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
-#include "base/mac_util.h"
+#include "base/mac/mac_util.h"
#include "base/memory_debug.h"
#include "base/message_loop.h"
#include "base/path_service.h"
@@ -80,7 +80,7 @@ base::LazyInstance <std::map<gfx::NativeWindow, TestShell *> >
FilePath GetResourcesFilePath() {
FilePath path;
// We need to know if we're bundled or not to know which path to use.
- if (mac_util::AmIBundled()) {
+ if (base::mac::AmIBundled()) {
PathService::Get(base::DIR_EXE, &path);
path = path.Append(FilePath::kParentDirectory);
return path.AppendASCII("Resources");
@@ -212,7 +212,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
// tests. This is a harmless failure for test_shell_tests.
g_resource_data_pack = new app::DataPack;
NSString *resource_path =
- [mac_util::MainAppBundle() pathForResource:@"test_shell"
+ [base::mac::MainAppBundle() pathForResource:@"test_shell"
ofType:@"pak"];
FilePath resources_pak_path([resource_path fileSystemRepresentation]);
if (!g_resource_data_pack->Load(resources_pak_path)) {
@@ -223,11 +223,11 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
// Load the Ahem font, which is used by layout tests.
const char* ahem_path_c;
- NSString* ahem_path = [[mac_util::MainAppBundle() resourcePath]
+ NSString* ahem_path = [[base::mac::MainAppBundle() resourcePath]
stringByAppendingPathComponent:@"AHEM____.TTF"];
ahem_path_c = [ahem_path fileSystemRepresentation];
FSRef ahem_fsref;
- if (!mac_util::FSRefFromPath(ahem_path_c, &ahem_fsref)) {
+ if (!base::mac::FSRefFromPath(ahem_path_c, &ahem_fsref)) {
DLOG(FATAL) << "FSRefFromPath " << ahem_path_c;
} else {
// The last argument is an ATSFontContainerRef that can be passed to
@@ -247,7 +247,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
// test plugins.
FilePath plugins_dir;
PathService::Get(base::DIR_EXE, &plugins_dir);
- if (mac_util::AmIBundled()) {
+ if (base::mac::AmIBundled()) {
plugins_dir = plugins_dir.AppendASCII("../../../plugins");
} else {
plugins_dir = plugins_dir.AppendASCII("plugins");
generated by cgit v1.1 at 2025-01-18 08:10:12 +0000