Source/WebCore/html/HTMLVideoElement.h - Issue 10870090: Merge 125052

Side by Side Diff: Source/WebCore/html/HTMLVideoElement.h

Issue 10870090: Merge 125052 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

Patch Set: Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « LayoutTests/fast/dom/beforeload/remove-video-poster-in-beforeload-listener-expected.txt ('k') | Source/WebCore/html/HTMLVideoElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.	2 * Copyright (C) 2007, 2008, 2009, 2010 Apple 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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
68 bool shouldDisplayPosterImage() const { return displayMode() == Poster \|\| di splayMode() == PosterWaitingForVideo; }	68 bool shouldDisplayPosterImage() const { return displayMode() == Poster \|\| di splayMode() == PosterWaitingForVideo; }

69	69

70 private:	70 private:

71 HTMLVideoElement(const QualifiedName&, Document*, bool);	71 HTMLVideoElement(const QualifiedName&, Document*, bool);

72	72

73 virtual bool rendererIsNeeded(const NodeRenderingContext&);	73 virtual bool rendererIsNeeded(const NodeRenderingContext&);

74 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)	74 #if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)

75 virtual RenderObject* createRenderer(RenderArena, RenderStyle);	75 virtual RenderObject* createRenderer(RenderArena, RenderStyle);

76 #endif	76 #endif

77 virtual void attach();	77 virtual void attach();

78 virtual void detach();

79 virtual void parseAttribute(const Attribute&) OVERRIDE;	78 virtual void parseAttribute(const Attribute&) OVERRIDE;

80 virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;	79 virtual bool isPresentationAttribute(const QualifiedName&) const OVERRIDE;

81 virtual void collectStyleForAttribute(const Attribute&, StylePropertySet*) O VERRIDE;	80 virtual void collectStyleForAttribute(const Attribute&, StylePropertySet*) O VERRIDE;

82 virtual bool isVideo() const { return true; }	81 virtual bool isVideo() const { return true; }

83 virtual bool hasVideo() const { return player() && player()->hasVideo(); }	82 virtual bool hasVideo() const { return player() && player()->hasVideo(); }

84 virtual bool supportsFullscreen() const;	83 virtual bool supportsFullscreen() const;

85 virtual bool isURLAttribute(const Attribute&) const OVERRIDE;	84 virtual bool isURLAttribute(const Attribute&) const OVERRIDE;

86 virtual const QualifiedName& imageSourceAttributeName() const;	85 virtual const QualifiedName& imageSourceAttributeName() const;

87	86

88 virtual bool hasAvailableVideoFrame() const;	87 virtual bool hasAvailableVideoFrame() const;

89 virtual void updateDisplayState();	88 virtual void updateDisplayState();

90 virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;	89 virtual void didMoveToNewDocument(Document* oldDocument) OVERRIDE;

91 virtual void setDisplayMode(DisplayMode);	90 virtual void setDisplayMode(DisplayMode);

92	91

93 OwnPtr<HTMLImageLoader> m_imageLoader;	92 OwnPtr<HTMLImageLoader> m_imageLoader;

94	93

95 };	94 };

96	95

97 } //namespace	96 } //namespace

98	97

99 #endif	98 #endif

100 #endif	99 #endif

OLD	NEW