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

Side by Side Diff: Source/core/testing/Internals.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 * 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 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 return toHTMLTextFormControlElement(element)->placeholderElement()-> textContent(); 710 return toHTMLTextFormControlElement(element)->placeholderElement()-> textContent();
711 } 711 }
712 712
713 return String(); 713 return String();
714 } 714 }
715 715
716 void Internals::selectColorInColorChooser(Element* element, const String& colorV alue) 716 void Internals::selectColorInColorChooser(Element* element, const String& colorV alue)
717 { 717 {
718 if (!element->hasTagName(inputTag)) 718 if (!element->hasTagName(inputTag))
719 return; 719 return;
720 toHTMLInputElement(element)->selectColorInColorChooser(StyleColor(colorValue ).color()); 720 toHTMLInputElement(element)->selectColorInColorChooser(Color(colorValue));
721 } 721 }
722 722
723 Vector<String> Internals::formControlStateOfPreviousHistoryItem(ExceptionState& es) 723 Vector<String> Internals::formControlStateOfPreviousHistoryItem(ExceptionState& es)
724 { 724 {
725 HistoryItem* mainItem = frame()->loader()->history()->previousItem(); 725 HistoryItem* mainItem = frame()->loader()->history()->previousItem();
726 if (!mainItem) { 726 if (!mainItem) {
727 es.throwDOMException(InvalidAccessError); 727 es.throwDOMException(InvalidAccessError);
728 return Vector<String>(); 728 return Vector<String>();
729 } 729 }
730 String uniqueName = frame()->tree()->uniqueName(); 730 String uniqueName = frame()->tree()->uniqueName();
(...skipping 1480 matching lines...) Expand 10 before | Expand all | Expand 10 after
2211 return false; 2211 return false;
2212 sharedContext->getExtensions()->loseContextCHROMIUM(Extensions3D::GUILTY_CON TEXT_RESET_ARB, Extensions3D::INNOCENT_CONTEXT_RESET_ARB); 2212 sharedContext->getExtensions()->loseContextCHROMIUM(Extensions3D::GUILTY_CON TEXT_RESET_ARB, Extensions3D::INNOCENT_CONTEXT_RESET_ARB);
2213 // To prevent tests that call loseSharedGraphicsContext3D from being 2213 // To prevent tests that call loseSharedGraphicsContext3D from being
2214 // flaky, we call finish so that the context is guaranteed to be lost 2214 // flaky, we call finish so that the context is guaranteed to be lost
2215 // synchronously (i.e. before returning). 2215 // synchronously (i.e. before returning).
2216 sharedContext->finish(); 2216 sharedContext->finish();
2217 return true; 2217 return true;
2218 } 2218 }
2219 2219
2220 } 2220 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698