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

Side by Side Diff: Source/core/animation/EffectInput.cpp

Issue 211773002: Rename updateStyle to updateRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tracing test Created 6 years, 9 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
« no previous file with comments | « LayoutTests/inspector/tracing.html ('k') | Source/core/css/CSSComputedStyleDeclaration.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 #include "core/css/parser/BisonCSSParser.h" 37 #include "core/css/parser/BisonCSSParser.h"
38 #include "core/css/resolver/StyleResolver.h" 38 #include "core/css/resolver/StyleResolver.h"
39 #include "core/dom/Element.h" 39 #include "core/dom/Element.h"
40 40
41 namespace WebCore { 41 namespace WebCore {
42 42
43 static bool checkDocumentAndRenderer(Element* element) 43 static bool checkDocumentAndRenderer(Element* element)
44 { 44 {
45 if (!element->inActiveDocument()) 45 if (!element->inActiveDocument())
46 return false; 46 return false;
47 element->document().updateStyleIfNeeded(); 47 element->document().updateRenderTreeIfNeeded();
48 return element->renderer(); 48 return element->renderer();
49 } 49 }
50 50
51 PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c onst Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionSta te, bool unsafe) 51 PassRefPtrWillBeRawPtr<AnimationEffect> EffectInput::convert(Element* element, c onst Vector<Dictionary>& keyframeDictionaryVector, ExceptionState& exceptionSta te, bool unsafe)
52 { 52 {
53 // FIXME: This test will not be neccessary once resolution of keyframe value s occurs at 53 // FIXME: This test will not be neccessary once resolution of keyframe value s occurs at
54 // animation application time. 54 // animation application time.
55 if (!unsafe && !checkDocumentAndRenderer(element)) 55 if (!unsafe && !checkDocumentAndRenderer(element))
56 return nullptr; 56 return nullptr;
57 57
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 RefPtrWillBeRawPtr<KeyframeEffectModel> keyframeEffectModel = StyleResolver: :createKeyframeEffectModel(*element, propertySetVector, keyframes); 109 RefPtrWillBeRawPtr<KeyframeEffectModel> keyframeEffectModel = StyleResolver: :createKeyframeEffectModel(*element, propertySetVector, keyframes);
110 if (!keyframeEffectModel->isReplaceOnly()) { 110 if (!keyframeEffectModel->isReplaceOnly()) {
111 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported."); 111 exceptionState.throwDOMException(NotSupportedError, "Partial keyframes a re not supported.");
112 return nullptr; 112 return nullptr;
113 } 113 }
114 114
115 return keyframeEffectModel; 115 return keyframeEffectModel;
116 } 116 }
117 117
118 } // namespace WebCore 118 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/inspector/tracing.html ('k') | Source/core/css/CSSComputedStyleDeclaration.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698