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

Side by Side Diff: webkit/support/platform_support_mac.mm

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 8 years, 7 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/support/platform_support.h" 5 #include "webkit/support/platform_support.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 #include <AvailabilityMacros.h> 8 #include <AvailabilityMacros.h>
9 #import <Foundation/Foundation.h> 9 #import <Foundation/Foundation.h>
10 #import <objc/objc-runtime.h> 10 #import <objc/objc-runtime.h>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 SwizzleAllMethods(object_getClass(imposterClass), 96 SwizzleAllMethods(object_getClass(imposterClass),
97 object_getClass(originalClass)); 97 object_getClass(originalClass));
98 #endif 98 #endif
99 } 99 }
100 100
101 void AfterInitialize(bool unit_test_mode) { 101 void AfterInitialize(bool unit_test_mode) {
102 if (unit_test_mode) 102 if (unit_test_mode)
103 return; // We don't have a resource pack when running the unit-tests. 103 return; // We don't have a resource pack when running the unit-tests.
104 104
105 // Load a data pack. 105 // Load a data pack.
106 g_resource_data_pack = new ui::DataPack; 106 g_resource_data_pack = new ui::DataPack(ui::ResourceHandle::kScaleFactor1x);
107 NSString* resource_path = 107 NSString* resource_path =
108 [base::mac::FrameworkBundle() pathForResource:@"DumpRenderTree" 108 [base::mac::FrameworkBundle() pathForResource:@"DumpRenderTree"
109 ofType:@"pak"]; 109 ofType:@"pak"];
110 FilePath resources_pak_path([resource_path fileSystemRepresentation]); 110 FilePath resources_pak_path([resource_path fileSystemRepresentation]);
111 if (!g_resource_data_pack->Load(resources_pak_path)) { 111 if (!g_resource_data_pack->Load(resources_pak_path)) {
112 LOG(FATAL) << "failed to load DumpRenderTree.pak"; 112 LOG(FATAL) << "failed to load DumpRenderTree.pak";
113 } 113 }
114 114
115 // Load font files in the resource folder. 115 // Load font files in the resource folder.
116 static const char* const fontFileNames[] = { 116 static const char* const fontFileNames[] = {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 246 }
247 } 247 }
248 return resize_corner_data; 248 return resize_corner_data;
249 } 249 }
250 } 250 }
251 base::StringPiece res; 251 base::StringPiece res;
252 if (g_resource_data_pack) 252 if (g_resource_data_pack)
253 g_resource_data_pack->GetStringPiece(resource_id, &res); 253 g_resource_data_pack->GetStringPiece(resource_id, &res);
254 return res; 254 return res;
255 } 255 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698