[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
andersca at apple.com
andersca at apple.com
Thu Oct 29 20:42:02 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit c5c28694627270823d51412776875d018d279777
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 8 21:24:11 2009 +0000
WebCore: Remove the shouldLoadMediaElementURL frame loader client function.
Reviewed by Sam Weinig.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::willLoadMediaElementURL):
WebKit/mac: Remove the shouldLoadMediaElementURL implementation.
Reviewed by Sam Weinig.
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebPolicyDelegatePrivate.h:
WebKit/win: Remove the shouldLoadMediaElementURL implementation.
Reviewed by Sam Weinig.
* Interfaces/IWebPolicyDelegatePrivate.idl:
* WebCoreSupport/WebFrameLoaderClient.cpp:
(WebFrameLoaderClient::shouldUsePluginDocument):
* WebCoreSupport/WebFrameLoaderClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49320 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 23c7d20..6f38b21 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-08 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Remove the shouldLoadMediaElementURL frame loader client function.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::willLoadMediaElementURL):
+
2009-10-08 John Gregg <johnnyg at google.com>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 83da91d..f0a8f01 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -2148,9 +2148,6 @@ void FrameLoader::receivedData(const char* data, int length)
bool FrameLoader::willLoadMediaElementURL(KURL& url)
{
- if (!m_client->shouldLoadMediaElementURL(url))
- return false;
-
ResourceRequest request(url);
unsigned long identifier;
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 63c888a..874f5c1 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-08 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Remove the shouldLoadMediaElementURL implementation.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebPolicyDelegatePrivate.h:
+
2009-10-07 Simon Fraser <simon.fraser at apple.com>
Re-land 49269-49271 since reverting them did not fix the tests.
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
index 6259c80..6d365dd 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h
@@ -208,7 +208,6 @@ private:
NSDictionary *actionDictionary(const WebCore::NavigationAction&, PassRefPtr<WebCore::FormState>) const;
virtual bool canCachePage() const;
- virtual bool shouldLoadMediaElementURL(const WebCore::KURL&) const;
RetainPtr<WebFrame> m_webFrame;
diff --git a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
index ec05572..fcdd54d 100644
--- a/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
+++ b/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm
@@ -1738,18 +1738,7 @@ jobject WebFrameLoaderClient::javaApplet(NSView* view)
}
#endif
-bool WebFrameLoaderClient::shouldLoadMediaElementURL(const KURL& url) const {
- WebView *webView = getWebView(m_webFrame.get());
-
- if (id policyDelegate = [webView policyDelegate]) {
- if ([policyDelegate respondsToSelector:@selector(webView:shouldLoadMediaURL:inFrame:)])
- return [policyDelegate webView:webView shouldLoadMediaURL:url inFrame:m_webFrame.get()];
- }
- return true;
-}
-
@implementation WebFramePolicyListener
-
+ (void)initialize
{
JSC::initializeThreading();
diff --git a/WebKit/mac/WebView/WebPolicyDelegatePrivate.h b/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
index efdf007..45f8f45 100644
--- a/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
+++ b/WebKit/mac/WebView/WebPolicyDelegatePrivate.h
@@ -49,6 +49,4 @@ typedef enum {
@interface NSObject (WebPolicyDelegatePrivate)
// Needed for <rdar://problem/3951283> can view pages from the back/forward cache that should be disallowed by Parental Controls
- (BOOL)webView:(WebView *)webView shouldGoToHistoryItem:(WebHistoryItem *)item;
-
-- (BOOL)webView:(WebView *)webView shouldLoadMediaURL:(NSURL *)url inFrame:(WebFrame *)frame;
@end
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 354f82f..4227492 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-08 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Remove the shouldLoadMediaElementURL implementation.
+
+ * Interfaces/IWebPolicyDelegatePrivate.idl:
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::shouldUsePluginDocument):
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2009-10-08 Adam Roben <aroben at apple.com>
Make IWebInspectorPrivate be accessed in a more standard way
diff --git a/WebKit/win/Interfaces/IWebPolicyDelegatePrivate.idl b/WebKit/win/Interfaces/IWebPolicyDelegatePrivate.idl
index 4bb052c..f77fdb5 100644
--- a/WebKit/win/Interfaces/IWebPolicyDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebPolicyDelegatePrivate.idl
@@ -41,5 +41,4 @@ interface IWebFrame;
]
interface IWebPolicyDelegatePrivate : IUnknown
{
- HRESULT shouldLoadMediaURL([in] IWebView* webView, [in] BSTR url, [in] IWebFrame* frame, [out, retval] BOOL* retval);
}
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index 1281420..1fd3b2b 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -795,24 +795,3 @@ bool WebFrameLoaderClient::shouldUsePluginDocument(const String& mimeType) const
return webView->shouldUseEmbeddedView(mimeType);
}
-
-bool WebFrameLoaderClient::shouldLoadMediaElementURL(const KURL& url) const
-{
- WebView* webView = m_webFrame->webView();
- if (!webView)
- return true;
-
- COMPtr<IWebPolicyDelegate> policyDelegate;
- if (FAILED(webView->policyDelegate(&policyDelegate)) || !policyDelegate)
- return true;
-
- COMPtr<IWebPolicyDelegatePrivate> policyDelegatePrivate(Query, policyDelegate);
- if (!policyDelegatePrivate)
- return true;
-
- BOOL retval;
- if (FAILED(policyDelegatePrivate->shouldLoadMediaURL(webView, BString(url), m_webFrame, &retval)))
- return true;
-
- return retval;
-}
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
index a215cf9..921ae91 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h
@@ -112,7 +112,6 @@ public:
virtual bool shouldUsePluginDocument(const WebCore::String& mimeType) const;
virtual void dispatchDidFailToStartPlugin(const WebCore::PluginView*) const;
- virtual bool shouldLoadMediaElementURL(const WebCore::KURL&) const;
protected:
WebFrameLoaderClient(WebFrame*);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list