commit 7c5d7d58733b3dc3546dd3d44d0a08548cbdebc0
author weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Aug 24 14:59:26 2010 +0000
committer weinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Aug 24 14:59:26 2010 +0000
tree bb0c46c9cbb40026a1a7ed3ff88a48e70a04f905
parent 991b3f7d5a5217937fe5233b4ad4f341464ee80b

Fix for <rdar://problem/8153271> and <rdar://problem/8153288> 
Change behavior of javascript: urls in <embed> and <object> back to 
how they behaved before r50698.

Reviewed by Adam Barth.

WebCore: 

Tests: fast/loader/javascript-url-in-embed.html
       fast/loader/javascript-url-in-object.html

* loader/SubframeLoader.cpp:
(WebCore::SubframeLoader::requestFrame):
(WebCore::SubframeLoader::requestObject):
(WebCore::SubframeLoader::loadOrRedirectSubframe):
* loader/SubframeLoader.h:

LayoutTests: 

* fast/loader/javascript-url-in-embed-expected.txt: Added.
* fast/loader/javascript-url-in-embed.html: Added.
* fast/loader/javascript-url-in-object-expected.txt: Added.
* fast/loader/javascript-url-in-object.html: Added.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65900 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/loader/SubframeLoader.h

diff --git a/WebCore/loader/SubframeLoader.h b/WebCore/loader/SubframeLoader.h
index df08870..d42ef2c 100644
--- a/WebCore/loader/SubframeLoader.h
+++ b/WebCore/loader/SubframeLoader.h
@@ -74,6 +74,7 @@
     bool containsPlugins() const { return m_containsPlugins; }
 
 private:
+    Frame* loadOrRedirectSubframe(HTMLFrameOwnerElement*, const KURL&, const AtomicString& frameName, bool lockHistory, bool lockBackForwardList);
     Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer);
     bool loadPlugin(RenderEmbeddedObject*, const KURL&, const String& mimeType,
         const Vector<String>& paramNames, const Vector<String>& paramValues, bool useFallback);