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

Side by Side Diff: Source/core/accessibility/AccessibilityNodeObject.cpp

Issue 23581008: Revert r154797: "Move isValid/isCurrentColor from Color to StyleColor" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 months 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012, Google Inc. All rights reserved. 2 * Copyright (C) 2012, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 915 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 926
927 if (!node() || !node()->hasTagName(inputTag)) 927 if (!node() || !node()->hasTagName(inputTag))
928 return; 928 return;
929 929
930 HTMLInputElement* input = toHTMLInputElement(node()); 930 HTMLInputElement* input = toHTMLInputElement(node());
931 const AtomicString& type = input->getAttribute(typeAttr); 931 const AtomicString& type = input->getAttribute(typeAttr);
932 if (!equalIgnoringCase(type, "color")) 932 if (!equalIgnoringCase(type, "color"))
933 return; 933 return;
934 934
935 // HTMLInputElement::value always returns a string parseable by Color(). 935 // HTMLInputElement::value always returns a string parseable by Color().
936 StyleColor color(input->value()); 936 Color color(input->value());
937 r = color.red(); 937 r = color.red();
938 g = color.green(); 938 g = color.green();
939 b = color.blue(); 939 b = color.blue();
940 } 940 }
941 941
942 String AccessibilityNodeObject::valueDescription() const 942 String AccessibilityNodeObject::valueDescription() const
943 { 943 {
944 if (!supportsRangeValue()) 944 if (!supportsRangeValue())
945 return String(); 945 return String();
946 946
(...skipping 850 matching lines...) Expand 10 before | Expand all | Expand 10 after
1797 useTextUnderElement = true; 1797 useTextUnderElement = true;
1798 1798
1799 if (useTextUnderElement) { 1799 if (useTextUnderElement) {
1800 String text = textUnderElement(); 1800 String text = textUnderElement();
1801 if (!text.isEmpty()) 1801 if (!text.isEmpty())
1802 textOrder.append(AccessibilityText(text, ChildrenText)); 1802 textOrder.append(AccessibilityText(text, ChildrenText));
1803 } 1803 }
1804 } 1804 }
1805 1805
1806 } // namespace WebCore 1806 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/accessibility/AccessibilityTable.cpp » ('j') | Source/core/rendering/style/RenderStyle.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698