| 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 156                            const Vector<WTF::String>&, | 156                            const Vector<WTF::String>&, | 
| 157                            const WTF::String&, | 157                            const WTF::String&, | 
| 158                            bool load_manually, | 158                            bool load_manually, | 
| 159                            DetachedPluginPolicy) override; | 159                            DetachedPluginPolicy) override; | 
| 160   std::unique_ptr<WebMediaPlayer> CreateWebMediaPlayer( | 160   std::unique_ptr<WebMediaPlayer> CreateWebMediaPlayer( | 
| 161       HTMLMediaElement&, | 161       HTMLMediaElement&, | 
| 162       const WebMediaPlayerSource&, | 162       const WebMediaPlayerSource&, | 
| 163       WebMediaPlayerClient*) override; | 163       WebMediaPlayerClient*) override; | 
| 164   WebRemotePlaybackClient* CreateWebRemotePlaybackClient( | 164   WebRemotePlaybackClient* CreateWebRemotePlaybackClient( | 
| 165       HTMLMediaElement&) override; | 165       HTMLMediaElement&) override; | 
| 166   ObjectContentType GetObjectContentType( |  | 
| 167       const KURL&, |  | 
| 168       const WTF::String& mime_type, |  | 
| 169       bool should_prefer_plug_ins_for_images) override; |  | 
| 170   void DidChangeScrollOffset() override; | 166   void DidChangeScrollOffset() override; | 
| 171   void DidUpdateCurrentHistoryItem() override; | 167   void DidUpdateCurrentHistoryItem() override; | 
| 172 | 168 | 
| 173   bool AllowContentInitiatedDataUrlNavigations(const KURL&) override; | 169   bool AllowContentInitiatedDataUrlNavigations(const KURL&) override; | 
| 174 | 170 | 
| 175   WebCookieJar* CookieJar() const override; | 171   WebCookieJar* CookieJar() const override; | 
| 176   void FrameFocused() const override; | 172   void FrameFocused() const override; | 
| 177   void DidChangeName(const String&) override; | 173   void DidChangeName(const String&) override; | 
| 178   void DidEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override; | 174   void DidEnforceInsecureRequestPolicy(WebInsecureRequestPolicy) override; | 
| 179   void DidUpdateToUniqueOrigin() override; | 175   void DidUpdateToUniqueOrigin() override; | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 246 | 242 | 
| 247 DEFINE_TYPE_CASTS(LocalFrameClientImpl, | 243 DEFINE_TYPE_CASTS(LocalFrameClientImpl, | 
| 248                   LocalFrameClient, | 244                   LocalFrameClient, | 
| 249                   client, | 245                   client, | 
| 250                   client->IsLocalFrameClientImpl(), | 246                   client->IsLocalFrameClientImpl(), | 
| 251                   client.IsLocalFrameClientImpl()); | 247                   client.IsLocalFrameClientImpl()); | 
| 252 | 248 | 
| 253 }  // namespace blink | 249 }  // namespace blink | 
| 254 | 250 | 
| 255 #endif | 251 #endif | 
| OLD | NEW | 
|---|