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/glue/webkitplatformsupport_impl.h" | 5 #include "webkit/glue/webkitplatformsupport_impl.h" |
6 | 6 |
7 #if defined(OS_LINUX) | 7 #if defined(OS_LINUX) |
8 #include <malloc.h> | 8 #include <malloc.h> |
9 #endif | 9 #endif |
10 | 10 |
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, | 464 { "overhangPattern", IDR_OVERHANG_PATTERN, ui::SCALE_FACTOR_100P }, |
465 #endif | 465 #endif |
466 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, | 466 { "panIcon", IDR_PAN_SCROLL_ICON, ui::SCALE_FACTOR_100P }, |
467 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, | 467 { "searchCancel", IDR_SEARCH_CANCEL, ui::SCALE_FACTOR_100P }, |
468 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, | 468 { "searchCancelPressed", IDR_SEARCH_CANCEL_PRESSED, ui::SCALE_FACTOR_100P }, |
469 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, | 469 { "searchMagnifier", IDR_SEARCH_MAGNIFIER, ui::SCALE_FACTOR_100P }, |
470 { "searchMagnifierResults", | 470 { "searchMagnifierResults", |
471 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, | 471 IDR_SEARCH_MAGNIFIER_RESULTS, ui::SCALE_FACTOR_100P }, |
472 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, | 472 { "textAreaResizeCorner", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_100P }, |
473 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, | 473 { "textAreaResizeCorner@2x", IDR_TEXTAREA_RESIZER, ui::SCALE_FACTOR_200P }, |
474 { "tickmarkDash", IDR_TICKMARK_DASH, ui::SCALE_FACTOR_100P }, | |
475 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, | 474 { "inputSpeech", IDR_INPUT_SPEECH, ui::SCALE_FACTOR_100P }, |
476 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, | 475 { "inputSpeechRecording", IDR_INPUT_SPEECH_RECORDING, ui::SCALE_FACTOR_100P }, |
477 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, | 476 { "inputSpeechWaiting", IDR_INPUT_SPEECH_WAITING, ui::SCALE_FACTOR_100P }, |
478 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P }, | 477 { "americanExpressCC", IDR_AUTOFILL_CC_AMEX, ui::SCALE_FACTOR_100P }, |
479 { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P }, | 478 { "dinersCC", IDR_AUTOFILL_CC_DINERS, ui::SCALE_FACTOR_100P }, |
480 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P }, | 479 { "discoverCC", IDR_AUTOFILL_CC_DISCOVER, ui::SCALE_FACTOR_100P }, |
481 { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P }, | 480 { "genericCC", IDR_AUTOFILL_CC_GENERIC, ui::SCALE_FACTOR_100P }, |
482 { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P }, | 481 { "jcbCC", IDR_AUTOFILL_CC_JCB, ui::SCALE_FACTOR_100P }, |
483 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P }, | 482 { "masterCardCC", IDR_AUTOFILL_CC_MASTERCARD, ui::SCALE_FACTOR_100P }, |
484 { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P }, | 483 { "soloCC", IDR_AUTOFILL_CC_SOLO, ui::SCALE_FACTOR_100P }, |
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
778 worker_task_runner->OnWorkerRunLoopStarted(runLoop); | 777 worker_task_runner->OnWorkerRunLoopStarted(runLoop); |
779 } | 778 } |
780 | 779 |
781 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( | 780 void WebKitPlatformSupportImpl::didStopWorkerRunLoop( |
782 const WebKit::WebWorkerRunLoop& runLoop) { | 781 const WebKit::WebWorkerRunLoop& runLoop) { |
783 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); | 782 WorkerTaskRunner* worker_task_runner = WorkerTaskRunner::Instance(); |
784 worker_task_runner->OnWorkerRunLoopStopped(runLoop); | 783 worker_task_runner->OnWorkerRunLoopStopped(runLoop); |
785 } | 784 } |
786 | 785 |
787 } // namespace webkit_glue | 786 } // namespace webkit_glue |
OLD | NEW |