Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 const WebCore::KURL& /* base_url */, | 124 const WebCore::KURL& /* base_url */, |
| 125 const Vector<WTF::String>& paramNames, | 125 const Vector<WTF::String>& paramNames, |
| 126 const Vector<WTF::String>& paramValues); | 126 const Vector<WTF::String>& paramValues); |
| 127 virtual WebCore::ObjectContentType objectContentType( | 127 virtual WebCore::ObjectContentType objectContentType( |
| 128 const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlug InsForImages); | 128 const WebCore::KURL&, const WTF::String& mimeType, bool shouldPreferPlug InsForImages); |
| 129 virtual void didChangeScrollOffset(); | 129 virtual void didChangeScrollOffset(); |
| 130 virtual bool allowScript(bool enabledPerSettings); | 130 virtual bool allowScript(bool enabledPerSettings); |
| 131 virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::K URL& scriptURL); | 131 virtual bool allowScriptFromSource(bool enabledPerSettings, const WebCore::K URL& scriptURL); |
| 132 virtual bool allowPlugins(bool enabledPerSettings); | 132 virtual bool allowPlugins(bool enabledPerSettings); |
| 133 virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageU RL); | 133 virtual bool allowImage(bool enabledPerSettings, const WebCore::KURL& imageU RL); |
| 134 virtual bool allowMedia(bool enabledPerSettings, const WebCore::KURL& mediaU RL); | |
|
jochen (gone - plz use gerrit)
2013/10/22 08:25:31
just allowMedia(mediaURL), I don't think we need a
pwnall-personal
2013/10/22 11:56:18
Done.
| |
| 134 virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore ::SecurityOrigin*, const WebCore::KURL&); | 135 virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore ::SecurityOrigin*, const WebCore::KURL&); |
| 135 virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::S ecurityOrigin*, const WebCore::KURL&); | 136 virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::S ecurityOrigin*, const WebCore::KURL&); |
| 136 virtual void didNotAllowScript(); | 137 virtual void didNotAllowScript(); |
| 137 virtual void didNotAllowPlugins(); | 138 virtual void didNotAllowPlugins(); |
| 138 | 139 |
| 139 virtual WebCookieJar* cookieJar() const; | 140 virtual WebCookieJar* cookieJar() const; |
| 140 virtual bool willCheckAndDispatchMessageEvent(WebCore::SecurityOrigin* targe t, WebCore::MessageEvent*) const; | 141 virtual bool willCheckAndDispatchMessageEvent(WebCore::SecurityOrigin* targe t, WebCore::MessageEvent*) const; |
| 141 virtual void didChangeName(const String&); | 142 virtual void didChangeName(const String&); |
| 142 | 143 |
| 143 virtual void dispatchWillOpenSocketStream(WebCore::SocketStreamHandle*) OVER RIDE; | 144 virtual void dispatchWillOpenSocketStream(WebCore::SocketStreamHandle*) OVER RIDE; |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 167 | 168 |
| 168 inline FrameLoaderClientImpl* toFrameLoaderClientImpl(WebCore::FrameLoaderClient * client) | 169 inline FrameLoaderClientImpl* toFrameLoaderClientImpl(WebCore::FrameLoaderClient * client) |
| 169 { | 170 { |
| 170 ASSERT_WITH_SECURITY_IMPLICATION(!client || client->isFrameLoaderClientImpl( )); | 171 ASSERT_WITH_SECURITY_IMPLICATION(!client || client->isFrameLoaderClientImpl( )); |
| 171 return static_cast<FrameLoaderClientImpl*>(client); | 172 return static_cast<FrameLoaderClientImpl*>(client); |
| 172 } | 173 } |
| 173 | 174 |
| 174 } // namespace WebKit | 175 } // namespace WebKit |
| 175 | 176 |
| 176 #endif | 177 #endif |
| OLD | NEW |