Changeset 161746 in webkit

Timestamp:

Jan 10, 2014, 10:41:35 PM (12 years ago)

Author:

Joseph Pecoraro

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (3 diffs)
• html/HTMLMediaElement.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-10  Joseph Pecoraro  <pecoraro@apple.com>
+
+        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  <andersca@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -21 +21 @@
  * 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.
  */
 
@@ -366 +366 @@
         addBehaviorRestriction(RequireUserGestureForRateChangeRestriction);
 #if ENABLE(IOS_AIRPLAY)
-        addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPicker);
+        addBehaviorRestriction(RequireUserGestureToShowPlaybackTargetPickerRestriction);
 #endif
     }
@@ -4722 +4722 @@
 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);
 }
 

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -21 +21 @@
  * 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.
  */
 
@@ -452 +452 @@
         RequirePageConsentToResumeMediaRestriction = 1 << 4,
 #if ENABLE(IOS_AIRPLAY)
-        RequireUserGestureToShowPlaybackTargetPicker = 1 << 5,
+        RequireUserGestureToShowPlaybackTargetPickerRestriction = 1 << 5,
 #endif
     };
@@ -463 +463 @@
     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