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

Side by Side Diff: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

Issue 2065593002: Unprefix the CSS 'filter' property (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove disabler. Try different DCHECK expressions. Created 4 years, 6 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 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "modules/canvas2d/BaseRenderingContext2D.h" 5 #include "modules/canvas2d/BaseRenderingContext2D.h"
6 6
7 #include "bindings/core/v8/ExceptionMessages.h" 7 #include "bindings/core/v8/ExceptionMessages.h"
8 #include "bindings/core/v8/ExceptionState.h" 8 #include "bindings/core/v8/ExceptionState.h"
9 #include "bindings/core/v8/ExceptionStatePlaceholder.h" 9 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
10 #include "core/css/parser/CSSParser.h" 10 #include "core/css/parser/CSSParser.h"
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 String BaseRenderingContext2D::filter() const 385 String BaseRenderingContext2D::filter() const
386 { 386 {
387 return state().unparsedFilter(); 387 return state().unparsedFilter();
388 } 388 }
389 389
390 void BaseRenderingContext2D::setFilter(const String& filterString) 390 void BaseRenderingContext2D::setFilter(const String& filterString)
391 { 391 {
392 if (filterString == state().unparsedFilter()) 392 if (filterString == state().unparsedFilter())
393 return; 393 return;
394 394
395 CSSValue* filterValue = CSSParser::parseSingleValue(CSSPropertyWebkitFilter, filterString, CSSParserContext(HTMLStandardMode, 0)); 395 CSSValue* filterValue = CSSParser::parseSingleValue(CSSPropertyFilter, filte rString, CSSParserContext(HTMLStandardMode, 0));
396 396
397 if (!filterValue || filterValue->isInitialValue() || filterValue->isInherite dValue()) 397 if (!filterValue || filterValue->isInitialValue() || filterValue->isInherite dValue())
398 return; 398 return;
399 399
400 modifiableState().setUnparsedFilter(filterString); 400 modifiableState().setUnparsedFilter(filterString);
401 modifiableState().setFilter(filterValue); 401 modifiableState().setFilter(filterValue);
402 snapshotStateForFilter(); 402 snapshotStateForFilter();
403 } 403 }
404 404
405 SVGMatrixTearOff* BaseRenderingContext2D::currentTransform() const 405 SVGMatrixTearOff* BaseRenderingContext2D::currentTransform() const
(...skipping 1077 matching lines...) Expand 10 before | Expand all | Expand 10 after
1483 1483
1484 imageBuffer()->willOverwriteCanvas(); 1484 imageBuffer()->willOverwriteCanvas();
1485 } 1485 }
1486 1486
1487 DEFINE_TRACE(BaseRenderingContext2D) 1487 DEFINE_TRACE(BaseRenderingContext2D)
1488 { 1488 {
1489 visitor->trace(m_stateStack); 1489 visitor->trace(m_stateStack);
1490 } 1490 }
1491 1491
1492 } // namespace blink 1492 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698