| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/child/blink_platform_impl.h" | 5 #include "content/child/blink_platform_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 694 { "searchMagnifierResults", | 694 { "searchMagnifierResults", |
| 695 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, | 695 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, |
| 696 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, | 696 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, |
| 697 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, | 697 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, |
| 698 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, | 698 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, |
| 699 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, | 699 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, |
| 700 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, | 700 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, |
| 701 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, | 701 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, |
| 702 { "generatePasswordHover", | 702 { "generatePasswordHover", |
| 703 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, | 703 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, |
| 704 // TODO(dgozman): remove this after moving to content-based touch emulation. | |
| 705 { "syntheticTouchCursor", | 704 { "syntheticTouchCursor", |
| 706 IDR_SYNTHETIC_TOUCH_CURSOR, ui::SCALE_FACTOR_100P }, | 705 IDR_SYNTHETIC_TOUCH_CURSOR, ui::SCALE_FACTOR_100P }, |
| 707 }; | 706 }; |
| 708 | 707 |
| 709 } // namespace | 708 } // namespace |
| 710 | 709 |
| 711 WebData BlinkPlatformImpl::loadResource(const char* name) { | 710 WebData BlinkPlatformImpl::loadResource(const char* name) { |
| 712 // Some clients will call into this method with an empty |name| when they have | 711 // Some clients will call into this method with an empty |name| when they have |
| 713 // optional resources. For example, the PopupMenuChromium code can have icons | 712 // optional resources. For example, the PopupMenuChromium code can have icons |
| 714 // for some Autofill items but not for others. | 713 // for some Autofill items but not for others. |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 } | 1046 } |
| 1048 | 1047 |
| 1049 // static | 1048 // static |
| 1050 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { | 1049 void BlinkPlatformImpl::DestroyCurrentThread(void* thread) { |
| 1051 WebThreadImplForMessageLoop* impl = | 1050 WebThreadImplForMessageLoop* impl = |
| 1052 static_cast<WebThreadImplForMessageLoop*>(thread); | 1051 static_cast<WebThreadImplForMessageLoop*>(thread); |
| 1053 delete impl; | 1052 delete impl; |
| 1054 } | 1053 } |
| 1055 | 1054 |
| 1056 } // namespace content | 1055 } // namespace content |
| OLD | NEW |