<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166937] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166937">166937</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 11:06:11 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow elements to register for changes in page scale
https://bugs.webkit.org/show_bug.cgi?id=131319
Reviewed by Eric Carlson.
Some parts of WebCore need to react to changes in the page
scale factor, such as resizing when the user zooms. A followup
patch will enable this for media controls - this simply lays
the groundwork.
At the moment we only allow HTMLMediaElements to register, but if
necessary this could be expanded in the future.
* dom/Document.cpp: New methods to keep a list of HTMLMediaElements that
are interested in updates.
(WebCore::Document::registerForPageScaleFactorChangedCallbacks):
(WebCore::Document::unregisterForPageScaleFactorChangedCallbacks):
(WebCore::Document::pageScaleFactorChanged):
* dom/Document.h:
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::registerWithDocument): Add ourselves to the
the document's pageScale callback.
(WebCore::HTMLMediaElement::unregisterWithDocument): Remove ourselves from the
the document's pageScale callback.
(WebCore::HTMLMediaElement::setMediaControlsDependOnPageScaleFactor): Add/remove ourselves to/from
the callback if necessary.
(WebCore::HTMLMediaElement::pageScaleFactorChanged): The callback function. Empty for now.
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::mediaControlsDependOnPageScaleFactor): Accessor.
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor): Tell all documents that the user has zoomed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementh">trunk/Source/WebCore/html/HTMLMediaElement.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-04-07 Dean Jackson <dino@apple.com>
+
+ Allow elements to register for changes in page scale
+ https://bugs.webkit.org/show_bug.cgi?id=131319
+
+ Reviewed by Eric Carlson.
+
+ Some parts of WebCore need to react to changes in the page
+ scale factor, such as resizing when the user zooms. A followup
+ patch will enable this for media controls - this simply lays
+ the groundwork.
+
+ At the moment we only allow HTMLMediaElements to register, but if
+ necessary this could be expanded in the future.
+
+ * dom/Document.cpp: New methods to keep a list of HTMLMediaElements that
+ are interested in updates.
+ (WebCore::Document::registerForPageScaleFactorChangedCallbacks):
+ (WebCore::Document::unregisterForPageScaleFactorChangedCallbacks):
+ (WebCore::Document::pageScaleFactorChanged):
+ * dom/Document.h:
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::HTMLMediaElement):
+ (WebCore::HTMLMediaElement::registerWithDocument): Add ourselves to the
+ the document's pageScale callback.
+ (WebCore::HTMLMediaElement::unregisterWithDocument): Remove ourselves from the
+ the document's pageScale callback.
+ (WebCore::HTMLMediaElement::setMediaControlsDependOnPageScaleFactor): Add/remove ourselves to/from
+ the callback if necessary.
+ (WebCore::HTMLMediaElement::pageScaleFactorChanged): The callback function. Empty for now.
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::mediaControlsDependOnPageScaleFactor): Accessor.
+ * page/Page.cpp:
+ (WebCore::Page::setPageScaleFactor): Tell all documents that the user has zoomed.
+
</ins><span class="cx"> 2014-04-08 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Compile error in TextureMapper.h
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -4195,6 +4195,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+void Document::registerForPageScaleFactorChangedCallbacks(HTMLMediaElement* element)
+{
+ m_pageScaleFactorChangedElements.add(element);
+}
+
+void Document::unregisterForPageScaleFactorChangedCallbacks(HTMLMediaElement* element)
+{
+ m_pageScaleFactorChangedElements.remove(element);
+}
+
+void Document::pageScaleFactorChanged()
+{
+ for (HTMLMediaElement* mediaElement : m_pageScaleFactorChangedElements)
+ mediaElement->pageScaleFactorChanged();
+}
+#endif
+
</ins><span class="cx"> void Document::setShouldCreateRenderers(bool f)
</span><span class="cx"> {
</span><span class="cx"> m_createRenderers = f;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/dom/Document.h 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -109,6 +109,7 @@
</span><span class="cx"> class HTMLIFrameElement;
</span><span class="cx"> class HTMLImageElement;
</span><span class="cx"> class HTMLMapElement;
</span><ins>+class HTMLMediaElement;
</ins><span class="cx"> class HTMLNameCollection;
</span><span class="cx"> class HTMLScriptElement;
</span><span class="cx"> class HitTestRequest;
</span><span class="lines">@@ -1040,6 +1041,12 @@
</span><span class="cx"> void captionPreferencesChanged();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ void registerForPageScaleFactorChangedCallbacks(HTMLMediaElement*);
+ void unregisterForPageScaleFactorChangedCallbacks(HTMLMediaElement*);
+ void pageScaleFactorChanged();
+#endif
+
</ins><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="cx"> void registerForVisibilityStateChangedCallbacks(Element*);
</span><span class="cx"> void unregisterForVisibilityStateChangedCallbacks(Element*);
</span><span class="lines">@@ -1531,6 +1538,10 @@
</span><span class="cx"> HashSet<Element*> m_captionPreferencesChangedElements;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ HashSet<HTMLMediaElement*> m_pageScaleFactorChangedElements;
+#endif
+
</ins><span class="cx"> #if ENABLE(PAGE_VISIBILITY_API)
</span><span class="cx"> HashSet<Element*> m_visibilityStateCallbackElements;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -330,6 +330,9 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_requestingPlay(false)
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ , m_mediaControlsDependOnPageScaleFactor(false)
+#endif
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> , m_tracksAreReady(true)
</span><span class="cx"> , m_haveVisibleTextTrack(false)
</span><span class="lines">@@ -451,6 +454,11 @@
</span><span class="cx"> document.registerForCaptionPreferencesChangedCallbacks(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ if (m_mediaControlsDependOnPageScaleFactor)
+ document.registerForPageScaleFactorChangedCallbacks(this);
+#endif
+
</ins><span class="cx"> addElementToDocumentMap(*this, document);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -471,6 +479,11 @@
</span><span class="cx"> document.unregisterForCaptionPreferencesChangedCallbacks(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ if (m_mediaControlsDependOnPageScaleFactor)
+ document.unregisterForPageScaleFactorChangedCallbacks(this);
+#endif
+
</ins><span class="cx"> removeElementFromDocumentMap(*this, document);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5979,6 +5992,24 @@
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> exec->clearException();
</span><span class="cx"> }
</span><ins>+
+void HTMLMediaElement::setMediaControlsDependOnPageScaleFactor(bool dependsOnPageScale)
+{
+ LOG(Media, "MediaElement::setMediaControlsDependPageScaleFactor = %s", boolString(dependsOnPageScale));
+ if (m_mediaControlsDependOnPageScaleFactor == dependsOnPageScale)
+ return;
+
+ m_mediaControlsDependOnPageScaleFactor = dependsOnPageScale;
+
+ if (m_mediaControlsDependOnPageScaleFactor)
+ document().registerForPageScaleFactorChangedCallbacks(this);
+ else
+ document().unregisterForPageScaleFactorChangedCallbacks(this);
+}
+
+void HTMLMediaElement::pageScaleFactorChanged()
+{
+}
</ins><span class="cx"> #endif // ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><span class="cx">
</span><span class="cx"> unsigned long long HTMLMediaElement::fileSize() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -456,6 +456,10 @@
</span><span class="cx"> MediaPlayer::Preload preloadValue() const { return m_preload; }
</span><span class="cx"> HTMLMediaSession& mediaSession() const { return *m_mediaSession; }
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ void pageScaleFactorChanged();
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> HTMLMediaElement(const QualifiedName&, Document&, bool);
</span><span class="cx"> virtual ~HTMLMediaElement();
</span><span class="lines">@@ -482,6 +486,11 @@
</span><span class="cx">
</span><span class="cx"> virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ bool mediaControlsDependOnPageScaleFactor() const { return m_mediaControlsDependOnPageScaleFactor; }
+ void setMediaControlsDependOnPageScaleFactor(bool);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> void createMediaPlayer();
</span><span class="cx">
</span><span class="lines">@@ -828,6 +837,10 @@
</span><span class="cx"> bool m_requestingPlay : 1;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ bool m_mediaControlsDependOnPageScaleFactor : 1;
+#endif
+
</ins><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> bool m_tracksAreReady : 1;
</span><span class="cx"> bool m_haveVisibleTextTrack : 1;
</span><span class="lines">@@ -877,6 +890,7 @@
</span><span class="cx"> size_t m_reportedExtraMemoryCost;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><ins>+ friend class MediaControlsHost;
</ins><span class="cx"> RefPtr<MediaControlsHost> m_mediaControlsHost;
</span><span class="cx"> RefPtr<DOMWrapperWorld> m_isolatedWorld;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (166936 => 166937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-04-08 18:04:59 UTC (rev 166936)
+++ trunk/Source/WebCore/page/Page.cpp 2014-04-08 18:06:11 UTC (rev 166937)
</span><span class="lines">@@ -730,6 +730,11 @@
</span><span class="cx"> if (!view->delegatesScrolling())
</span><span class="cx"> view->setScrollPosition(origin);
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(MEDIA_CONTROLS_SCRIPT)
+ for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext())
+ frame->document()->pageScaleFactorChanged();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Page::setDeviceScaleFactor(float scaleFactor)
</span></span></pre>
</div>
</div>
</body>
</html>