diff options
Diffstat (limited to 'WebCore/loader/FrameLoaderClient.h')
| -rw-r--r-- | WebCore/loader/FrameLoaderClient.h | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/WebCore/loader/FrameLoaderClient.h b/WebCore/loader/FrameLoaderClient.h index 2668958..26a1259 100644 --- a/WebCore/loader/FrameLoaderClient.h +++ b/WebCore/loader/FrameLoaderClient.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +32,6 @@ #include "FrameLoaderTypes.h" #include "ScrollTypes.h" #include <wtf/Forward.h> -#include <wtf/Platform.h> #include <wtf/Vector.h> typedef class _jobject* jobject; @@ -55,11 +54,16 @@ namespace WebCore { class FrameLoader; class HistoryItem; class HTMLAppletElement; + class HTMLFormElement; class HTMLFrameOwnerElement; +#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) + class HTMLMediaElement; +#endif class HTMLPlugInElement; class IntSize; class KURL; class NavigationAction; + class ProtectionSpace; class PluginView; class PolicyChecker; class ResourceError; @@ -71,7 +75,6 @@ namespace WebCore { class SecurityOrigin; class SharedBuffer; class SubstituteData; - class String; class Widget; typedef void (PolicyChecker::*FramePolicyFunction)(PolicyAction); @@ -105,17 +108,20 @@ namespace WebCore { virtual bool shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier) = 0; virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0; virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0; +#if USE(PROTECTION_SPACE_AUTH_CALLBACK) + virtual bool canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long identifier, const ProtectionSpace&) = 0; +#endif virtual void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&) = 0; virtual void dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int lengthReceived) = 0; virtual void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier) = 0; virtual void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&) = 0; virtual bool dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int length) = 0; - virtual void dispatchDidLoadResourceByXMLHttpRequest(unsigned long identifier, const ScriptString&) = 0; virtual void dispatchDidHandleOnloadEvents() = 0; virtual void dispatchDidReceiveServerRedirectForProvisionalLoad() = 0; virtual void dispatchDidCancelClientRedirect() = 0; virtual void dispatchWillPerformClientRedirect(const KURL&, double interval, double fireDate) = 0; + virtual void dispatchDidNavigateWithinPage() { } virtual void dispatchDidChangeLocationWithinPage() = 0; virtual void dispatchDidPushStateWithinPage() = 0; virtual void dispatchDidReplaceStateWithinPage() = 0; @@ -124,6 +130,7 @@ namespace WebCore { virtual void dispatchDidReceiveIcon() = 0; virtual void dispatchDidStartProvisionalLoad() = 0; virtual void dispatchDidReceiveTitle(const String& title) = 0; + virtual void dispatchDidChangeIcons() = 0; virtual void dispatchDidCommitLoad() = 0; virtual void dispatchDidFailProvisionalLoad(const ResourceError&) = 0; virtual void dispatchDidFailLoad(const ResourceError&) = 0; @@ -142,6 +149,7 @@ namespace WebCore { virtual void dispatchUnableToImplementPolicy(const ResourceError&) = 0; + virtual void dispatchWillSendSubmitEvent(HTMLFormElement*) = 0; virtual void dispatchWillSubmitForm(FramePolicyFunction, PassRefPtr<FormState>) = 0; virtual void dispatchDidLoadMainResource(DocumentLoader*) = 0; @@ -219,12 +227,18 @@ namespace WebCore { virtual PassRefPtr<Frame> createFrame(const KURL& url, const String& name, HTMLFrameOwnerElement* ownerElement, const String& referrer, bool allowsScrolling, int marginWidth, int marginHeight) = 0; + virtual void didTransferChildFrameToNewDocument() = 0; virtual PassRefPtr<Widget> createPlugin(const IntSize&, HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool loadManually) = 0; virtual void redirectDataToPlugin(Widget* pluginWidget) = 0; virtual PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const KURL& baseURL, const Vector<String>& paramNames, const Vector<String>& paramValues) = 0; virtual void dispatchDidFailToStartPlugin(const PluginView*) const { } +#if ENABLE(PLUGIN_PROXY_FOR_VIDEO) + virtual PassRefPtr<Widget> createMediaPlayerProxyPlugin(const IntSize&, HTMLMediaElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&) = 0; + virtual void hideMediaPlayerProxyPlugin(Widget*) = 0; + virtual void showMediaPlayerProxyPlugin(Widget*) = 0; +#endif virtual ObjectContentType objectContentType(const KURL& url, const String& mimeType) = 0; virtual String overrideMediaType() const = 0; @@ -245,7 +259,7 @@ namespace WebCore { #endif #if PLATFORM(MAC) -#if ENABLE(MAC_JAVA_BRIDGE) +#if ENABLE(JAVA_BRIDGE) virtual jobject javaApplet(NSView*) { return 0; } #endif virtual NSCachedURLResponse* willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const = 0; @@ -262,6 +276,15 @@ namespace WebCore { virtual bool allowJavaScript(bool enabledPerSettings) { return enabledPerSettings; } virtual bool allowPlugins(bool enabledPerSettings) { return enabledPerSettings; } virtual bool allowImages(bool enabledPerSettings) { return enabledPerSettings; } + + // This callback notifies the client that the frame was about to run + // JavaScript but did not because allowJavaScript returned false. We + // have a separate callback here because there are a number of places + // that need to know if JavaScript is enabled but are not necessarily + // preparing to execute script. + virtual void didNotAllowScript() { } + // This callback is similar, but for plugins. + virtual void didNotAllowPlugins() { } }; } // namespace WebCore |