Unreviewed, rolling out r168192.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 22:56:56 +0000 (22:56 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 22:56:56 +0000 (22:56 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132498

Was not the correct fix (blurry!) (Requested by bfulgham_ on
#webkit).

Reverted changeset:

"[iOS] deviceScaleFactor is being double-applied when
rendering captions in full screen mode"
https://bugs.webkit.org/show_bug.cgi?id=132481
http://trac.webkit.org/changeset/168192

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@168204 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/html/shadow/MediaControlElements.cpp

index d61d953..1605f31 100644 (file)
@@ -1,3 +1,18 @@
+2014-05-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r168192.
+        https://bugs.webkit.org/show_bug.cgi?id=132498
+
+        Was not the correct fix (blurry!) (Requested by bfulgham_ on
+        #webkit).
+
+        Reverted changeset:
+
+        "[iOS] deviceScaleFactor is being double-applied when
+        rendering captions in full screen mode"
+        https://bugs.webkit.org/show_bug.cgi?id=132481
+        http://trac.webkit.org/changeset/168192
+
 2014-05-02  Alexey Proskuryakov  <ap@apple.com>
 
         Remove Blob contentDisposition handling
index a0932db..d2f4a94 100644 (file)
@@ -1358,6 +1358,9 @@ void MediaControlTextTrackContainerElement::updateDisplay()
                 m_textTrackRepresentation = TextTrackRepresentation::create(this);
             mediaElement->setTextTrackRepresentation(m_textTrackRepresentation.get());
 
+            if (Page* page = document().page())
+                m_textTrackRepresentation->setContentScale(page->deviceScaleFactor());
+
             m_textTrackRepresentation->update();
             setInlineStyleProperty(CSSPropertyWidth, m_videoDisplaySize.size().width(), CSSPrimitiveValue::CSS_PX);
             setInlineStyleProperty(CSSPropertyHeight, m_videoDisplaySize.size().height(), CSSPrimitiveValue::CSS_PX);