| 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/child/webkitplatformsupport_impl.h" | 5 #include "webkit/child/webkitplatformsupport_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 625 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, | 625 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, |
| 626 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, | 626 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, |
| 627 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, | 627 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, |
| 628 { "searchMagnifierResults", | 628 { "searchMagnifierResults", |
| 629 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, | 629 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, |
| 630 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, | 630 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, |
| 631 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, | 631 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, |
| 632 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, | 632 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, |
| 633 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, | 633 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, |
| 634 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, | 634 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, |
| 635 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P }, | |
| 636 { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P }, | |
| 637 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P }, | |
| 638 { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P }, | |
| 639 { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P }, | |
| 640 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P }, | |
| 641 { "visaCC", IDR_AUTOFILL_CC_VISA, ui::SCALE_FACTOR_100P }, | |
| 642 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, | 635 { "generatePassword", IDR_PASSWORD_GENERATION_ICON, ui::SCALE_FACTOR_100P }, |
| 643 { "generatePasswordHover", | 636 { "generatePasswordHover", |
| 644 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, | 637 IDR_PASSWORD_GENERATION_ICON_HOVER, ui::SCALE_FACTOR_100P }, |
| 645 { "syntheticTouchCursor", | 638 { "syntheticTouchCursor", |
| 646 IDR_SYNTHETIC_TOUCH_CURSOR, ui::SCALE_FACTOR_100P }, | 639 IDR_SYNTHETIC_TOUCH_CURSOR, ui::SCALE_FACTOR_100P }, |
| 647 }; | 640 }; |
| 648 | 641 |
| 649 } // namespace | 642 } // namespace |
| 650 | 643 |
| 651 WebData WebKitPlatformSupportImpl::loadResource(const char* name) { | 644 WebData WebKitPlatformSupportImpl::loadResource(const char* name) { |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 909 if (--shared_timer_suspended_ == 0 && | 902 if (--shared_timer_suspended_ == 0 && |
| 910 (!shared_timer_.IsRunning() || | 903 (!shared_timer_.IsRunning() || |
| 911 shared_timer_fire_time_was_set_while_suspended_)) { | 904 shared_timer_fire_time_was_set_while_suspended_)) { |
| 912 shared_timer_fire_time_was_set_while_suspended_ = false; | 905 shared_timer_fire_time_was_set_while_suspended_ = false; |
| 913 setSharedTimerFireInterval( | 906 setSharedTimerFireInterval( |
| 914 shared_timer_fire_time_ - monotonicallyIncreasingTime()); | 907 shared_timer_fire_time_ - monotonicallyIncreasingTime()); |
| 915 } | 908 } |
| 916 } | 909 } |
| 917 | 910 |
| 918 } // namespace webkit_glue | 911 } // namespace webkit_glue |
| OLD | NEW |