Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 679 #if ENABLE(INPUT_TYPE_COLOR) | 679 #if ENABLE(INPUT_TYPE_COLOR) |
| 680 void Internals::selectColorInColorChooser(Element* element, const String& colorV alue) | 680 void Internals::selectColorInColorChooser(Element* element, const String& colorV alue) |
| 681 { | 681 { |
| 682 if (!element->hasTagName(inputTag)) | 682 if (!element->hasTagName(inputTag)) |
| 683 return; | 683 return; |
| 684 HTMLInputElement* inputElement = element->toInputElement(); | 684 HTMLInputElement* inputElement = element->toInputElement(); |
| 685 if (!inputElement) | 685 if (!inputElement) |
| 686 return; | 686 return; |
| 687 inputElement->selectColorInColorChooser(Color(colorValue)); | 687 inputElement->selectColorInColorChooser(Color(colorValue)); |
| 688 } | 688 } |
| 689 | |
|
tkent
2013/05/21 06:33:01
nit: You don't need to touch this file.
| |
| 689 #endif | 690 #endif |
| 690 | 691 |
| 691 Vector<String> Internals::formControlStateOfPreviousHistoryItem(ExceptionCode& e c) | 692 Vector<String> Internals::formControlStateOfPreviousHistoryItem(ExceptionCode& e c) |
| 692 { | 693 { |
| 693 HistoryItem* mainItem = frame()->loader()->history()->previousItem(); | 694 HistoryItem* mainItem = frame()->loader()->history()->previousItem(); |
| 694 if (!mainItem) { | 695 if (!mainItem) { |
| 695 ec = INVALID_ACCESS_ERR; | 696 ec = INVALID_ACCESS_ERR; |
| 696 return Vector<String>(); | 697 return Vector<String>(); |
| 697 } | 698 } |
| 698 String uniqueName = frame()->tree()->uniqueName(); | 699 String uniqueName = frame()->tree()->uniqueName(); |
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1924 | 1925 |
| 1925 RenderObject* renderer = select->renderer(); | 1926 RenderObject* renderer = select->renderer(); |
| 1926 if (!renderer->isMenuList()) | 1927 if (!renderer->isMenuList()) |
| 1927 return false; | 1928 return false; |
| 1928 | 1929 |
| 1929 RenderMenuList* menuList = toRenderMenuList(renderer); | 1930 RenderMenuList* menuList = toRenderMenuList(renderer); |
| 1930 return menuList->popupIsVisible(); | 1931 return menuList->popupIsVisible(); |
| 1931 } | 1932 } |
| 1932 | 1933 |
| 1933 } | 1934 } |
| OLD | NEW |