Title: [161746] trunk/Source/WebCore
- Revision
- 161746
- Author
- [email protected]
- Date
- 2014-01-10 22:41:35 -0800 (Fri, 10 Jan 2014)
Log Message
Fix HTMLMediaElement.o for iOS. Unreviewed build fix.
There is now local variable mediaElement. Just call the
functions since they are methods on this class.
Fix RequireUserGestureToShowPlaybackTargetPickerRestriction typos.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161745 => 161746)
--- trunk/Source/WebCore/ChangeLog 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/ChangeLog 2014-01-11 06:41:35 UTC (rev 161746)
@@ -1,3 +1,15 @@
+2014-01-10 Joseph Pecoraro <[email protected]>
+
+ Fix HTMLMediaElement.o for iOS. Unreviewed build fix.
+
+ There is now local variable mediaElement. Just call the
+ functions since they are methods on this class.
+
+ Fix RequireUserGestureToShowPlaybackTargetPickerRestriction typos.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::parseAttribute):
+
2014-01-10 Anders Carlsson <[email protected]>
Move progress tracking functions from FrameLoaderClient to a new ProgressTrackerClient
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (161745 => 161746)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-01-11 06:41:35 UTC (rev 161746)
@@ -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.
*/
#include "config.h"
@@ -365,7 +365,7 @@
if (!settings || settings->mediaPlaybackRequiresUserGesture()) {
addBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
#if ENABLE(IOS_AIRPLAY)
- addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPicker);
+ addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPickerRestriction);
#endif
}
#endif // !PLATFORM(IOS)
@@ -4721,17 +4721,17 @@
void HTMLMediaElement::updateWidget(PluginCreationOption)
{
- mediaElement->setNeedWidgetUpdate(false);
+ setNeedWidgetUpdate(false);
+ // FIXME: What if document().frame() is 0?
+
+ URL url;
Vector<String> paramNames;
Vector<String> paramValues;
- // FIXME: Rename kurl to something more sensible.
- URL kurl;
- mediaElement->getPluginProxyParams(kurl, paramNames, paramValues);
- // FIXME: What if document().frame() is 0?
+ getPluginProxyParams(url, paramNames, paramValues);
SubframeLoader& loader = document().frame()->loader().subframeLoader();
- loader.loadMediaPlayerProxyPlugin(*mediaElement, kurl, paramNames, paramValues);
+ loader.loadMediaPlayerProxyPlugin(*this, url, paramNames, paramValues);
}
#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (161745 => 161746)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-11 06:33:45 UTC (rev 161745)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-01-11 06:41:35 UTC (rev 161746)
@@ -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 HTMLMediaElement_h
@@ -451,7 +451,7 @@
RequirePageConsentToLoadMediaRestriction = 1 << 3,
RequirePageConsentToResumeMediaRestriction = 1 << 4,
#if ENABLE(IOS_AIRPLAY)
- RequireUserGestureToShowPlaybackTargetPicker = 1 << 5,
+ RequireUserGestureToShowPlaybackTargetPickerRestriction = 1 << 5,
#endif
};
typedef unsigned BehaviorRestrictions;
@@ -462,7 +462,7 @@
bool pageConsentRequiredForLoad() const { return m_restrictions & RequirePageConsentToLoadMediaRestriction; }
bool pageConsentRequiredForResume() const { return m_restrictions & RequirePageConsentToResumeMediaRestriction; }
#if ENABLE(IOS_AIRPLAY)
- bool userGestureRequiredToShowPlaybackTargetPicker() const { return m_restrictions & RequireUserGestureToShowPlaybackTargetPicker; }
+ bool userGestureRequiredToShowPlaybackTargetPicker() const { return m_restrictions & RequireUserGestureToShowPlaybackTargetPickerRestriction; }
#endif
void addBehaviorRestriction(BehaviorRestrictions restriction) { m_restrictions |= restriction; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
