OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
64 class WebContentDecryptionModule; | 64 class WebContentDecryptionModule; |
65 class WebCookieJar; | 65 class WebCookieJar; |
66 class WebDataSource; | 66 class WebDataSource; |
67 class WebEncryptedMediaClient; | 67 class WebEncryptedMediaClient; |
68 class WebExternalPopupMenu; | 68 class WebExternalPopupMenu; |
69 class WebExternalPopupMenuClient; | 69 class WebExternalPopupMenuClient; |
70 class WebFormElement; | 70 class WebFormElement; |
71 class WebGeolocationClient; | 71 class WebGeolocationClient; |
72 class WebMediaPlayer; | 72 class WebMediaPlayer; |
73 class WebMediaPlayerClient; | 73 class WebMediaPlayerClient; |
74 class WebMediaPlayerEncryptedMediaClient; | |
74 class WebMIDIClient; | 75 class WebMIDIClient; |
75 class WebNotificationPermissionCallback; | 76 class WebNotificationPermissionCallback; |
76 class WebPermissionClient; | 77 class WebPermissionClient; |
77 class WebServiceWorkerProvider; | 78 class WebServiceWorkerProvider; |
78 class WebSocketHandle; | 79 class WebSocketHandle; |
79 class WebPlugin; | 80 class WebPlugin; |
80 class WebPluginPlaceholder; | 81 class WebPluginPlaceholder; |
81 class WebPresentationClient; | 82 class WebPresentationClient; |
82 class WebPushClient; | 83 class WebPushClient; |
83 class WebRTCPeerConnectionHandler; | 84 class WebRTCPeerConnectionHandler; |
(...skipping 16 matching lines...) Expand all Loading... | |
100 class WebFrameClient { | 101 class WebFrameClient { |
101 public: | 102 public: |
102 // Factory methods ----------------------------------------------------- | 103 // Factory methods ----------------------------------------------------- |
103 | 104 |
104 // May return null. | 105 // May return null. |
105 virtual WebPluginPlaceholder* createPluginPlaceholder(WebLocalFrame*, const WebPluginParams&) { return 0; } | 106 virtual WebPluginPlaceholder* createPluginPlaceholder(WebLocalFrame*, const WebPluginParams&) { return 0; } |
106 | 107 |
107 // May return null. | 108 // May return null. |
108 virtual WebPlugin* createPlugin(WebLocalFrame*, const WebPluginParams&) { re turn 0; } | 109 virtual WebPlugin* createPlugin(WebLocalFrame*, const WebPluginParams&) { re turn 0; } |
109 | 110 |
111 // TODO(srirama): Remove this method once blink updated. | |
112 virtual WebMediaPlayer* createMediaPlayer(blink::WebLocalFrame*, const blink ::WebURL&, blink::WebMediaPlayerClient*, blink::WebContentDecryptionModule*) { r eturn 0; } | |
ddorwin
2015/05/26 21:33:41
blink:: is unnecessary
Srirama
2015/05/27 17:15:47
Acknowledged.
| |
113 | |
110 // May return null. | 114 // May return null. |
111 // WebContentDecryptionModule* may be null if one has not yet been set. | 115 // WebContentDecryptionModule* may be null if one has not yet been set. |
112 virtual WebMediaPlayer* createMediaPlayer(WebLocalFrame*, const WebURL&, Web MediaPlayerClient*, WebContentDecryptionModule*) { return 0; } | 116 virtual WebMediaPlayer* createMediaPlayer(WebLocalFrame*, const WebURL&, Web MediaPlayerClient*, WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionMod ule*) { return 0; } |
113 | 117 |
114 // May return null. | 118 // May return null. |
115 virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) { return 0; } | 119 virtual WebApplicationCacheHost* createApplicationCacheHost(WebLocalFrame*, WebApplicationCacheHostClient*) { return 0; } |
116 | 120 |
117 // May return null. | 121 // May return null. |
118 virtual WebServiceWorkerProvider* createServiceWorkerProvider(WebLocalFrame* frame) { return 0; } | 122 virtual WebServiceWorkerProvider* createServiceWorkerProvider(WebLocalFrame* frame) { return 0; } |
119 | 123 |
120 // May return null. | 124 // May return null. |
121 virtual WebWorkerContentSettingsClientProxy* createWorkerContentSettingsClie ntProxy(WebLocalFrame* frame) { return 0; } | 125 virtual WebWorkerContentSettingsClientProxy* createWorkerContentSettingsClie ntProxy(WebLocalFrame* frame) { return 0; } |
122 | 126 |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
652 // App Banners --------------------------------------------------------- | 656 // App Banners --------------------------------------------------------- |
653 virtual WebAppBannerClient* appBannerClient() { return 0; } | 657 virtual WebAppBannerClient* appBannerClient() { return 0; } |
654 | 658 |
655 protected: | 659 protected: |
656 virtual ~WebFrameClient() { } | 660 virtual ~WebFrameClient() { } |
657 }; | 661 }; |
658 | 662 |
659 } // namespace blink | 663 } // namespace blink |
660 | 664 |
661 #endif | 665 #endif |
OLD | NEW |