Bug 437448. New-style nsSVGString (simpler and more efficient support for animated values). (adding missed files) r+sr=roc

content/svg/content/src/nsSVGString.cpp

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla SVG project.
+ *
+ * The Initial Developer of the Original Code is Robert Longson.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsSVGString.h"
+
+NS_IMPL_ADDREF(nsSVGString::DOMAnimatedString)
+NS_IMPL_RELEASE(nsSVGString::DOMAnimatedString)
+
+NS_INTERFACE_MAP_BEGIN(nsSVGString::DOMAnimatedString)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedString)
+  NS_INTERFACE_MAP_ENTRY(nsISupports)
+  NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedString)
+NS_INTERFACE_MAP_END
+
+/* Implementation */
+
+void
+nsSVGString::SetBaseValue(const nsAString& aValue,
+                          nsSVGElement *aSVGElement,
+                          PRBool aDoSetAttr)
+{
+  mAnimVal = mBaseVal = aValue;
+  aSVGElement->DidChangeString(mAttrEnum, aDoSetAttr);
+}
+
+nsresult
+nsSVGString::ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
+                                 nsSVGElement *aSVGElement)
+{
+  *aResult = new DOMAnimatedString(this, aSVGElement);
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  NS_ADDREF(*aResult);
+  return NS_OK;
+}

content/svg/content/src/nsSVGString.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla SVG project.
+ *
+ * The Initial Developer of the Original Code is Robert Longson.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef __NS_SVGSTRING_H__
+#define __NS_SVGSTRING_H__
+
+#include "nsIDOMSVGAnimatedString.h"
+#include "nsSVGElement.h"
+#include "nsDOMError.h"
+
+class nsSVGString
+{
+
+public:
+  void Init(PRUint8 aAttrEnum) {
+    mAnimVal.Truncate();
+    mBaseVal.Truncate();
+    mAttrEnum = aAttrEnum;
+  }
+
+  void SetBaseValue(const nsAString& aValue,
+                    nsSVGElement *aSVGElement,
+                    PRBool aDoSetAttr);
+  const nsString &GetBaseValue() const
+    { return mBaseVal; }
+  const nsString &GetAnimValue() const
+    { return mAnimVal; }
+
+  nsresult ToDOMAnimatedString(nsIDOMSVGAnimatedString **aResult,
+                               nsSVGElement* aSVGElement);
+
+private:
+
+  nsString mAnimVal;
+  nsString mBaseVal;
+  PRUint8 mAttrEnum; // element specified tracking for attribute
+
+  struct DOMAnimatedString : public nsIDOMSVGAnimatedString
+  {
+    NS_DECL_ISUPPORTS
+
+    DOMAnimatedString(nsSVGString* aVal, nsSVGElement *aSVGElement)
+      : mVal(aVal), mSVGElement(aSVGElement) {}
+
+    nsSVGString* mVal; // kept alive because it belongs to content
+    nsRefPtr<nsSVGElement> mSVGElement;
+
+    NS_IMETHOD GetBaseVal(nsAString & aResult)
+      { aResult = mVal->GetBaseValue(); return NS_OK; }
+    NS_IMETHOD SetBaseVal(const nsAString & aValue)
+      { mVal->SetBaseValue(aValue, mSVGElement, PR_TRUE); return NS_OK; }
+
+    NS_IMETHOD GetAnimVal(nsAString & aResult)
+      { aResult = mVal->GetAnimValue(); return NS_OK; }
+
+  };
+};
+#endif //__NS_SVGSTRING_H__