diff --git a/content/html/document/src/VideoDocument.cpp b/content/html/document/src/VideoDocument.cpp index 12e4b6b0060f..2016ec4ebae4 100644 --- a/content/html/document/src/VideoDocument.cpp +++ b/content/html/document/src/VideoDocument.cpp @@ -63,7 +63,6 @@ protected: // Sets document to reflect the file name and description. void UpdateTitle(nsIChannel* aChannel); - void InsertMediaFragmentScript(); nsresult CreateSyntheticVideoDocument(nsIChannel* aChannel, nsIStreamListener** aListener); @@ -107,29 +106,6 @@ VideoDocument::SetScriptGlobalObject(nsIScriptGlobalObject* aScriptGlobalObject) LinkStylesheet(NS_LITERAL_STRING("resource://gre/res/TopLevelVideoDocument.css")); LinkStylesheet(NS_LITERAL_STRING("chrome://global/skin/TopLevelVideoDocument.css")); } - - if (aScriptGlobalObject) { - InsertMediaFragmentScript(); - } -} - -void -VideoDocument::InsertMediaFragmentScript() -{ - nsCOMPtr<nsINodeInfo> nodeInfo; - nodeInfo = mNodeInfoManager->GetNodeInfo(nsGkAtoms::script, nsnull, - kNameSpaceID_XHTML, - nsIDOMNode::ELEMENT_NODE); - if (!nodeInfo) - { - return; - } - - nsRefPtr<nsGenericHTMLElement> script = NS_NewHTMLScriptElement(nodeInfo.forget()); - script->SetTextContent(NS_LITERAL_STRING("window.addEventListener('hashchange',function(e){document.querySelector('audio,video').src=e.newURL;},false);")); - - Element* head = GetHeadElement(); - head->AppendChildTo(script, false); } nsresult diff --git a/content/html/document/test/Makefile.in b/content/html/document/test/Makefile.in index ab463f8122d2..23d6ae90ef6f 100644 --- a/content/html/document/test/Makefile.in +++ b/content/html/document/test/Makefile.in @@ -104,11 +104,10 @@ _TEST_FILES = test_bug1682.html \ bug499092.html \ test_bug512367.html \ test_bug571981.html \ - test_bug677122.html \ test_bug677495.html \ test_bug677495-1.html \ - test_bug741266.html \ test_bug742261.html \ + test_bug741266.html \ $(NULL) ifneq (mobile,$(MOZ_BUILD_APP)) diff --git a/content/html/document/test/test_bug677122.html b/content/html/document/test/test_bug677122.html deleted file mode 100644 index fef112bce695..000000000000 --- a/content/html/document/test/test_bug677122.html +++ /dev/null @@ -1,85 +0,0 @@ -<!DOCTYPE HTML> -<html> -<head> - <title>Media test: MediaDocument hashchange mediafragment. - - - - -
-
-
- -