Title: [161720] trunk/Source/WebCore
- Revision
- 161720
- Author
- joep...@webkit.org
- Date
- 2014-01-10 19:58:22 -0800 (Fri, 10 Jan 2014)
Log Message
Fix MediaPlayerPrivateIOS.o for iOS. Unreviewed build fix.
Add missing MediaPlayerProxy Objective C methods and forward declarations.
* platform/graphics/mac/MediaPlayerProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161719 => 161720)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 03:49:10 UTC (rev 161719)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 03:58:22 UTC (rev 161720)
@@ -1,5 +1,13 @@
2014-01-10 Joseph Pecoraro <pecor...@apple.com>
+ Fix MediaPlayerPrivateIOS.o for iOS. Unreviewed build fix.
+
+ Add missing MediaPlayerProxy Objective C methods and forward declarations.
+
+ * platform/graphics/mac/MediaPlayerProxy.h:
+
+2014-01-10 Joseph Pecoraro <pecor...@apple.com>
+
Fix FrameSelection.o for iOS. Unreviewed build fix.
r160966 renamed rendererIsEditable to hasEditableStyle.
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h (161719 => 161720)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h 2014-01-11 03:49:10 UTC (rev 161719)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerProxy.h 2014-01-11 03:58:22 UTC (rev 161720)
@@ -20,7 +20,7 @@
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef MediaPlayerProxy_h
@@ -39,6 +39,8 @@
#define OBJC_CLASS class
#endif
#endif // !defined(OBJC_CLASS)
+
+OBJC_CLASS CALayer;
#endif // PLATFORM(IOS)
OBJC_CLASS WebMediaPlayerProxy;
@@ -155,6 +157,13 @@
- (NSArray *)_mimeTypes;
+#if PLATFORM(IOS)
+- (void)_setDelegate:(id)delegate;
+- (void)_setOutOfBandTextTracks:(NSArray *)textTracks;
+- (void)_setSelectedTextTrack:(NSNumber *)textTrack;
+- (void)_setTextTrackRepresentation:(CALayer*)representation;
+#endif
+
@end
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes