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

Side by Side Diff: Source/core/svg/SVGBoolean.cpp

Issue 131253002: [SVG] SVGAnimatedBoolean migration to new SVG property impl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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
11 * copyright notice, this list of conditions and the following disclaimer 11 * copyright notice, this list of conditions and the following disclaimer
12 * in the documentation and/or other materials provided with the 12 * in the documentation and/or other materials provided with the
13 * distribution. 13 * distribution.
14 * * Neither the name of Google Inc. nor the names of its 14 * * Neither the name of Google Inc. nor the names of its
15 * contributors may be used to endorse or promote products derived from 15 * contributors may be used to endorse or promote products derived from
16 * this software without specific prior written permission. 16 * this software without specific prior written permission.
17 * 17 *
18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "core/workers/AbstractWorker.h" 32
33 #include "core/svg/SVGBoolean.h"
33 34
34 #include "bindings/v8/ExceptionState.h" 35 #include "bindings/v8/ExceptionState.h"
36 #include "bindings/v8/ExceptionStatePlaceholder.h"
35 #include "core/dom/ExceptionCode.h" 37 #include "core/dom/ExceptionCode.h"
36 #include "core/dom/ExecutionContext.h" 38 #include "core/svg/SVGAnimationElement.h"
37 #include "core/frame/ContentSecurityPolicy.h"
38 #include "platform/weborigin/SecurityOrigin.h"
39 39
40 namespace WebCore { 40 namespace WebCore {
41 41
42 AbstractWorker::AbstractWorker(ExecutionContext* context) 42 PassRefPtr<NewSVGPropertyBase> SVGBoolean::cloneForAnimation(const String& value ) const
43 : ActiveDOMObject(context)
44 { 43 {
44 RefPtr<SVGBoolean> ret = create();
haraken 2014/01/09 11:09:23 ret => svgBoolean
kouhei (in TOK) 2014/01/10 08:16:10 Done.
45 ret->setValueAsString(value, IGNORE_EXCEPTION);
46 return ret.release();
45 } 47 }
46 48
47 AbstractWorker::~AbstractWorker() 49 String SVGBoolean::valueAsString() const
48 { 50 {
51 return m_value ? "true" : "false";
49 } 52 }
50 53
51 KURL AbstractWorker::resolveURL(const String& url, ExceptionState& exceptionStat e) 54 void SVGBoolean::setValueAsString(const String& value, ExceptionState& exception State)
52 { 55 {
53 // FIXME: This should use the dynamic global scope (bug #27887) 56 if (value == "true") {
54 KURL scriptURL = executionContext()->completeURL(url); 57 m_value = true;
55 if (!scriptURL.isValid()) { 58 } else if (value == "false") {
56 exceptionState.throwDOMException(SyntaxError, "'" + url + "' is not a va lid URL."); 59 m_value = false;
57 return KURL(); 60 } else {
61 exceptionState.throwDOMException(SyntaxError, "The value provided ('" + value + "') is invalid.");
58 } 62 }
59
60 // We can safely expose the URL in the following exceptions, as these checks happen synchronously before redirection. JavaScript receives no new information .
61 if (!executionContext()->securityOrigin()->canRequest(scriptURL)) {
62 exceptionState.throwSecurityError("Script at '" + scriptURL.elidedString () + "' cannot be accessed from origin '" + executionContext()->securityOrigin() ->toString() + "'.");
63 return KURL();
64 }
65
66 if (executionContext()->contentSecurityPolicy() && !executionContext()->cont entSecurityPolicy()->allowScriptFromSource(scriptURL)) {
67 exceptionState.throwSecurityError("Access to the script at '" + scriptUR L.elidedString() + "' is denied by the document's Content Security Policy.");
68 return KURL();
69 }
70
71 return scriptURL;
72 } 63 }
73 64
74 } // namespace WebCore 65 void SVGBoolean::add(PassRefPtr<NewSVGPropertyBase>, SVGElement*)
66 {
67 ASSERT_NOT_REACHED();
68 }
69
70 void SVGBoolean::calculateAnimatedValue(SVGAnimationElement* animationElement, f loat percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> from, Pass RefPtr<NewSVGPropertyBase> to, PassRefPtr<NewSVGPropertyBase>, SVGElement*)
71 {
72 ASSERT(animationElement);
73 bool fromBoolean = animationElement->animationMode() == ToAnimation ? m_valu e : toSVGBoolean(from)->value();
74 bool toBoolean = toSVGBoolean(to)->value();
75
76 animationElement->animateDiscreteType<bool>(percentage, fromBoolean, toBoole an, m_value);
77 }
78
79 float SVGBoolean::calculateDistance(PassRefPtr<NewSVGPropertyBase>, SVGElement*)
80 {
81 // No paced animations for boolean.
82 return -1;
83 }
84
85 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698