| 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 const WebMediaPlayerSource&, | 155 const WebMediaPlayerSource&, |
| 156 WebMediaPlayerClient*) override; | 156 WebMediaPlayerClient*) override; |
| 157 WebRemotePlaybackClient* createWebRemotePlaybackClient( | 157 WebRemotePlaybackClient* createWebRemotePlaybackClient( |
| 158 HTMLMediaElement&) override; | 158 HTMLMediaElement&) 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 didUpdateCurrentHistoryItem() override; | 164 void didUpdateCurrentHistoryItem() override; |
| 165 void didRestorePageScaleFactorOnLoad(float pageScale) 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; |
| 174 void passiveInsecureContentFound(const KURL&) override; | 175 void passiveInsecureContentFound(const KURL&) override; |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 | 237 |
| 237 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, | 238 DEFINE_TYPE_CASTS(FrameLoaderClientImpl, |
| 238 FrameLoaderClient, | 239 FrameLoaderClient, |
| 239 client, | 240 client, |
| 240 client->isFrameLoaderClientImpl(), | 241 client->isFrameLoaderClientImpl(), |
| 241 client.isFrameLoaderClientImpl()); | 242 client.isFrameLoaderClientImpl()); |
| 242 | 243 |
| 243 } // namespace blink | 244 } // namespace blink |
| 244 | 245 |
| 245 #endif | 246 #endif |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2652643004:
Make PageScaleFactor work for oopif subframes.
