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

Side by Side Diff: Source/core/css/CSSPrimitiveValueMappings.h

Issue 663313005: Comply Compositing spec [1]; remove 'plus-darker'. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Mark virtual/display_list_2d_canvas/fast/canvas/canvas-composite NeedsRebaseline Created 5 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 break; 341 break;
342 case CompositeDestinationOut: 342 case CompositeDestinationOut:
343 m_value.valueID = CSSValueDestinationOut; 343 m_value.valueID = CSSValueDestinationOut;
344 break; 344 break;
345 case CompositeDestinationAtop: 345 case CompositeDestinationAtop:
346 m_value.valueID = CSSValueDestinationAtop; 346 m_value.valueID = CSSValueDestinationAtop;
347 break; 347 break;
348 case CompositeXOR: 348 case CompositeXOR:
349 m_value.valueID = CSSValueXor; 349 m_value.valueID = CSSValueXor;
350 break; 350 break;
351 case CompositePlusDarker:
352 m_value.valueID = CSSValuePlusDarker;
353 break;
354 case CompositePlusLighter: 351 case CompositePlusLighter:
355 m_value.valueID = CSSValuePlusLighter; 352 m_value.valueID = CSSValuePlusLighter;
356 break; 353 break;
357 case CompositeDifference: 354 default:
358 ASSERT_NOT_REACHED(); 355 ASSERT_NOT_REACHED();
359 break; 356 break;
360 } 357 }
361 } 358 }
362 359
363 template<> inline CSSPrimitiveValue::operator CompositeOperator() const 360 template<> inline CSSPrimitiveValue::operator CompositeOperator() const
364 { 361 {
365 ASSERT(isValueID()); 362 ASSERT(isValueID());
366 switch (m_value.valueID) { 363 switch (m_value.valueID) {
367 case CSSValueClear: 364 case CSSValueClear:
(...skipping 11 matching lines...) Expand all
379 case CSSValueDestinationOver: 376 case CSSValueDestinationOver:
380 return CompositeDestinationOver; 377 return CompositeDestinationOver;
381 case CSSValueDestinationIn: 378 case CSSValueDestinationIn:
382 return CompositeDestinationIn; 379 return CompositeDestinationIn;
383 case CSSValueDestinationOut: 380 case CSSValueDestinationOut:
384 return CompositeDestinationOut; 381 return CompositeDestinationOut;
385 case CSSValueDestinationAtop: 382 case CSSValueDestinationAtop:
386 return CompositeDestinationAtop; 383 return CompositeDestinationAtop;
387 case CSSValueXor: 384 case CSSValueXor:
388 return CompositeXOR; 385 return CompositeXOR;
389 case CSSValuePlusDarker:
390 return CompositePlusDarker;
391 case CSSValuePlusLighter: 386 case CSSValuePlusLighter:
392 return CompositePlusLighter; 387 return CompositePlusLighter;
393 default: 388 default:
394 break; 389 break;
395 } 390 }
396 391
397 ASSERT_NOT_REACHED(); 392 ASSERT_NOT_REACHED();
398 return CompositeClear; 393 return CompositeClear;
399 } 394 }
400 395
(...skipping 4377 matching lines...) Expand 10 before | Expand all | Expand 10 after
4778 default: 4773 default:
4779 break; 4774 break;
4780 } 4775 }
4781 ASSERT_NOT_REACHED(); 4776 ASSERT_NOT_REACHED();
4782 return ScrollBehaviorAuto; 4777 return ScrollBehaviorAuto;
4783 } 4778 }
4784 4779
4785 } 4780 }
4786 4781
4787 #endif 4782 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698