| OLD | NEW |
| 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/tools/test_shell/test_shell.h" | 5 #include "webkit/tools/test_shell/test_shell.h" |
| 6 | 6 |
| 7 #include <windows.h> | 7 #include <windows.h> |
| 8 #include <commdlg.h> | 8 #include <commdlg.h> |
| 9 #include <objbase.h> | 9 #include <objbase.h> |
| 10 #include <process.h> | 10 #include <process.h> |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 bool allow_external_pages) { | 155 bool allow_external_pages) { |
| 156 // Start COM stuff. | 156 // Start COM stuff. |
| 157 HRESULT res = OleInitialize(NULL); | 157 HRESULT res = OleInitialize(NULL); |
| 158 DCHECK(SUCCEEDED(res)); | 158 DCHECK(SUCCEEDED(res)); |
| 159 | 159 |
| 160 window_list_ = new WindowList; | 160 window_list_ = new WindowList; |
| 161 instance_handle_ = ::GetModuleHandle(NULL); | 161 instance_handle_ = ::GetModuleHandle(NULL); |
| 162 layout_test_mode_ = layout_test_mode; | 162 layout_test_mode_ = layout_test_mode; |
| 163 allow_external_pages_ = allow_external_pages; | 163 allow_external_pages_ = allow_external_pages; |
| 164 | 164 |
| 165 web_prefs_ = new WebPreferences; | 165 web_prefs_ = new webkit_glue::WebPreferences; |
| 166 | 166 |
| 167 ResetWebPreferences(); | 167 ResetWebPreferences(); |
| 168 | 168 |
| 169 // Register the Ahem font used by layout tests. | 169 // Register the Ahem font used by layout tests. |
| 170 DWORD num_fonts = 1; | 170 DWORD num_fonts = 1; |
| 171 void* font_ptr; | 171 void* font_ptr; |
| 172 size_t font_size; | 172 size_t font_size; |
| 173 if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL), | 173 if (base::win::GetDataResourceFromModule(::GetModuleHandle(NULL), |
| 174 IDR_AHEM_FONT, &font_ptr, &font_size)) { | 174 IDR_AHEM_FONT, &font_ptr, &font_size)) { |
| 175 HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts); | 175 HANDLE rc = AddFontMemResourceEx(font_ptr, font_size, 0, &num_fonts); |
| (...skipping 554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 730 | 730 |
| 731 bool EnsureFontLoaded(HFONT font) { | 731 bool EnsureFontLoaded(HFONT font) { |
| 732 return true; | 732 return true; |
| 733 } | 733 } |
| 734 | 734 |
| 735 bool DownloadUrl(const std::string& url, HWND caller_window) { | 735 bool DownloadUrl(const std::string& url, HWND caller_window) { |
| 736 return false; | 736 return false; |
| 737 } | 737 } |
| 738 | 738 |
| 739 } // namespace webkit_glue | 739 } // namespace webkit_glue |
| OLD | NEW |