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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 2549443003: Move <marquee> implementation to HTMLMarqueeElement.cpp (Closed)
Patch Set: Add asserts for didParse Created 4 years 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
OLDNEW
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 <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 ui::SCALE_FACTOR_NONE}, 625 ui::SCALE_FACTOR_NONE},
626 {"DocumentExecCommand.js", 626 {"DocumentExecCommand.js",
627 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS, 627 IDR_PRIVATE_SCRIPT_DOCUMENTEXECCOMMAND_JS,
628 ui::SCALE_FACTOR_NONE}, 628 ui::SCALE_FACTOR_NONE},
629 {"DocumentXMLTreeViewer.css", 629 {"DocumentXMLTreeViewer.css",
630 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS, 630 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_CSS,
631 ui::SCALE_FACTOR_NONE}, 631 ui::SCALE_FACTOR_NONE},
632 {"DocumentXMLTreeViewer.js", 632 {"DocumentXMLTreeViewer.js",
633 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS, 633 IDR_PRIVATE_SCRIPT_DOCUMENTXMLTREEVIEWER_JS,
634 ui::SCALE_FACTOR_NONE}, 634 ui::SCALE_FACTOR_NONE},
635 {"HTMLMarqueeElement.js",
636 IDR_PRIVATE_SCRIPT_HTMLMARQUEEELEMENT_JS,
637 ui::SCALE_FACTOR_NONE},
638 {"PrivateScriptRunner.js", 635 {"PrivateScriptRunner.js",
639 IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS, 636 IDR_PRIVATE_SCRIPT_PRIVATESCRIPTRUNNER_JS,
640 ui::SCALE_FACTOR_NONE}, 637 ui::SCALE_FACTOR_NONE},
641 #ifdef IDR_PICKER_COMMON_JS 638 #ifdef IDR_PICKER_COMMON_JS
642 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE}, 639 {"pickerCommon.js", IDR_PICKER_COMMON_JS, ui::SCALE_FACTOR_NONE},
643 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE}, 640 {"pickerCommon.css", IDR_PICKER_COMMON_CSS, ui::SCALE_FACTOR_NONE},
644 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE}, 641 {"calendarPicker.js", IDR_CALENDAR_PICKER_JS, ui::SCALE_FACTOR_NONE},
645 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE}, 642 {"calendarPicker.css", IDR_CALENDAR_PICKER_CSS, ui::SCALE_FACTOR_NONE},
646 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE}, 643 {"listPicker.js", IDR_LIST_PICKER_JS, ui::SCALE_FACTOR_NONE},
647 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE}, 644 {"listPicker.css", IDR_LIST_PICKER_CSS, ui::SCALE_FACTOR_NONE},
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
874 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 871 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
875 static_cast<ui::DomKey>(dom_key))); 872 static_cast<ui::DomKey>(dom_key)));
876 } 873 }
877 874
878 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 875 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
879 return static_cast<int>( 876 return static_cast<int>(
880 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 877 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
881 } 878 }
882 879
883 } // namespace content 880 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698