Backed out changeset 8421bc750585 (bug 888864) for Werror bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Jul 2013 12:03:59 -0400
changeset 138697 130d254e9e44bbc168650ce3d318f34f90e16d52
parent 138696 b9a221ccef07c5427765bc81c15c141dd0312466
child 138698 2bc7b329583d0e66648b1dec72324193b2f5a8fe
push id24964
push userryanvm@gmail.com
push dateTue, 16 Jul 2013 20:04:09 +0000
treeherdermozilla-central@fd10ead17ace [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs888864
milestone25.0a1
backs out8421bc7505851157457c4986d31a3e1edbf67de3
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8421bc750585 (bug 888864) for Werror bustage.
content/base/src/Comment.h
content/base/src/nsGenericDOMDataNode.h
content/base/src/nsTextNode.h
content/base/test/Makefile.in
content/base/test/test_processing_instruction_update_stylesheet.xhtml
content/xml/content/src/CDATASection.h
content/xml/content/src/ProcessingInstruction.h
content/xml/content/src/XMLStylesheetProcessingInstruction.h
--- a/content/base/src/Comment.h
+++ b/content/base/src/Comment.h
@@ -41,17 +41,16 @@ public:
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMNode
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMCharacterData
   NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
-  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
 
   // nsIDOMComment
   // Empty interface
 
   // nsINode
   virtual bool IsNodeOfType(uint32_t aFlags) const;
 
   virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
--- a/content/base/src/nsGenericDOMDataNode.h
+++ b/content/base/src/nsGenericDOMDataNode.h
@@ -164,17 +164,17 @@ public:
     return NS_OK;
   }
 
   nsresult SplitData(uint32_t aOffset, nsIContent** aReturn,
                      bool aCloneAfterOriginal = true);
 
   // WebIDL API
   // Our XPCOM GetData is just fine for WebIDL
-  virtual void SetData(const nsAString& aData, mozilla::ErrorResult& rv)
+  void SetData(const nsAString& aData, mozilla::ErrorResult& rv)
   {
     rv = SetData(aData);
   }
   // nsINode::Length() returns the right thing for our length attribute
   void SubstringData(uint32_t aStart, uint32_t aCount, nsAString& aReturn,
                      mozilla::ErrorResult& rv);
   void AppendData(const nsAString& aData, mozilla::ErrorResult& rv)
   {
--- a/content/base/src/nsTextNode.h
+++ b/content/base/src/nsTextNode.h
@@ -48,17 +48,16 @@ public:
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMNode
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMCharacterData
   NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
-  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
 
   // nsIDOMText
   NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
 
   // nsINode
   virtual bool IsNodeOfType(uint32_t aFlags) const;
 
   virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -633,17 +633,16 @@ MOCHITEST_FILES_C= \
 		test_CSP_bug885433.html \
 		file_CSP_bug885433_allows.html \
 		file_CSP_bug885433_allows.html^headers^ \
 		file_CSP_bug885433_blocks.html \
 		file_CSP_bug885433_blocks.html^headers^ \
 		test_bug890580.html \
 		test_declare_stylesheet_obsolete.html \
 		variable_style_sheet.sjs \
-		test_processing_instruction_update_stylesheet.xhtml \
 		$(NULL)
 
 # OOP tests don't work on Windows (bug 763081) or native-fennec
 # (see Bug 774939)
 ifneq ($(OS_ARCH),WINNT)
 ifndef MOZ_ANDROID_OMTC
 MOCHITEST_FILES_B += \
 		test_messagemanager_assertpermission.html \
deleted file mode 100644
--- a/content/base/test/test_processing_instruction_update_stylesheet.xhtml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="data:text/css;charset=UTF-8,p{color:red}" type="text/css"?>
-<!DOCTYPE html
-PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-"DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=888864
--->
-<head>
-  <title>Test for Bug 888864</title>
-  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-  <![CDATA[
-
-  /** Test for Bug 888864 **/
-  SimpleTest.waitForExplicitFinish();
-
-  function changeColorAndRun(callback) {
-    var piNode = document.firstChild;
-    piNode.data = 'href="data:text/css;charset=UTF-8,p{color:green}" type="text/css"';
-    piNode.addEventListener("load", callback);
-  }
-
-  function runTest() {
-    var previousColor = window.getComputedStyle(document.getElementById("display")).
-                               getPropertyValue("color");
-    changeColorAndRun(function() {
-        var afterChange = window.getComputedStyle(document.getElementById("display")).
-                                 getPropertyValue("color");
-        isnot(previousColor, afterChange,
-              "Color of the p element should change.");
-        SimpleTest.finish();
-    });
-  }
-  ]]>
-</script>
-</head>
-<body onload="runTest();">
-<p id="display">This changes color</p>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=888864">Mozilla Bug 888864</a>
-<pre id="test">
-</pre>
-</body>
-</html>
--- a/content/xml/content/src/CDATASection.h
+++ b/content/xml/content/src/CDATASection.h
@@ -43,17 +43,16 @@ public:
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMNode
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMCharacterData
   NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
-  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
 
   // nsIDOMText
   NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
 
   // nsIDOMCDATASection
   // Empty interface
 
   // nsINode
--- a/content/xml/content/src/ProcessingInstruction.h
+++ b/content/xml/content/src/ProcessingInstruction.h
@@ -25,17 +25,16 @@ public:
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMNode
   NS_FORWARD_NSIDOMNODE_TO_NSINODE
 
   // nsIDOMCharacterData
   NS_FORWARD_NSIDOMCHARACTERDATA(nsGenericDOMDataNode::)
-  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
 
   // nsIDOMProcessingInstruction
   NS_DECL_NSIDOMPROCESSINGINSTRUCTION
 
   // nsINode
   virtual bool IsNodeOfType(uint32_t aFlags) const;
 
   virtual nsGenericDOMDataNode* CloneDataNode(nsINodeInfo *aNodeInfo,
--- a/content/xml/content/src/XMLStylesheetProcessingInstruction.h
+++ b/content/xml/content/src/XMLStylesheetProcessingInstruction.h
@@ -58,27 +58,16 @@ public:
                               bool aNullParent = true) MOZ_OVERRIDE;
 
   // nsIStyleSheetLinkingElement
   virtual void OverrideBaseURI(nsIURI* aNewBaseURI) MOZ_OVERRIDE;
 
   // nsStyleLinkElement
   NS_IMETHOD GetCharset(nsAString& aCharset) MOZ_OVERRIDE;
 
-  virtual void SetData(const nsAString& aData, mozilla::ErrorResult& rv) MOZ_OVERRIDE
-  {
-    nsGenericDOMDataNode::SetData(aData, rv);
-    if (rv.Failed()) {
-      return;
-    }
-    UpdateStyleSheetInternal(nullptr, true);
-  }
-  using nsGenericDOMDataNode::SetData; // Prevent hiding overloaded virtual function.
-  using ProcessingInstruction::SetData;
-
 protected:
   nsCOMPtr<nsIURI> mOverriddenBaseURI;
 
   already_AddRefed<nsIURI> GetStyleSheetURL(bool* aIsInline) MOZ_OVERRIDE;
   void GetStyleSheetInfo(nsAString& aTitle,
                          nsAString& aType,
                          nsAString& aMedia,
                          bool* aIsScoped,