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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 DetachedPluginPolicy) override; | 154 DetachedPluginPolicy) override; |
155 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer( | 155 std::unique_ptr<WebMediaPlayer> createWebMediaPlayer( |
156 HTMLMediaElement&, | 156 HTMLMediaElement&, |
157 const WebMediaPlayerSource&, | 157 const WebMediaPlayerSource&, |
158 WebMediaPlayerClient*) override; | 158 WebMediaPlayerClient*) override; |
159 ObjectContentType getObjectContentType( | 159 ObjectContentType getObjectContentType( |
160 const KURL&, | 160 const KURL&, |
161 const WTF::String& mimeType, | 161 const WTF::String& mimeType, |
162 bool shouldPreferPlugInsForImages) override; | 162 bool shouldPreferPlugInsForImages) override; |
163 void didChangeScrollOffset() override; | 163 void didChangeScrollOffset() override; |
| 164 void didRestorePageScaleFactorOnLoad(float pageScale) override; |
164 void didUpdateCurrentHistoryItem() override; | 165 void didUpdateCurrentHistoryItem() override; |
165 bool allowScript(bool enabledPerSettings) override; | 166 bool allowScript(bool enabledPerSettings) override; |
166 bool allowScriptFromSource(bool enabledPerSettings, | 167 bool allowScriptFromSource(bool enabledPerSettings, |
167 const KURL& scriptURL) override; | 168 const KURL& scriptURL) override; |
168 bool allowPlugins(bool enabledPerSettings) override; | 169 bool allowPlugins(bool enabledPerSettings) override; |
169 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override; | 170 bool allowImage(bool enabledPerSettings, const KURL& imageURL) override; |
170 bool allowRunningInsecureContent(bool enabledPerSettings, | 171 bool allowRunningInsecureContent(bool enabledPerSettings, |
171 SecurityOrigin*, | 172 SecurityOrigin*, |
172 const KURL&) override; | 173 const KURL&) override; |
173 bool allowAutoplay(bool defaultValue) override; | 174 bool allowAutoplay(bool defaultValue) override; |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 | 234 |
234 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, | 235 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, |
235 FrameLoaderClient, | 236 FrameLoaderClient, |
236 client, | 237 client, |
237 client->isFrameLoaderClientImpl(), | 238 client->isFrameLoaderClientImpl(), |
238 client.isFrameLoaderClientImpl()); | 239 client.isFrameLoaderClientImpl()); |
239 | 240 |
240 } // namespace blink | 241 } // namespace blink |
241 | 242 |
242 #endif | 243 #endif |
OLD | NEW |