<!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>[163839] trunk/Source</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/163839">163839</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-10 17:10:18 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Add support for image document viewport configuration
https://bugs.webkit.org/show_bug.cgi?id=128565
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-02-10
Reviewed by Simon Fraser.
Source/WebCore:
Add proper default settings for displaying images.
* WebCore.exp.in:
* page/ViewportConfiguration.cpp:
(WebCore::ViewportConfiguration::imageDocumentParameters):
(WebCore::ViewportConfiguration::textDocumentParameters):
* page/ViewportConfiguration.h:
Source/WebKit2:
* UIProcess/API/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::screenToWindow):
(WebKit::PageClientImpl::windowToScreen):
Add the implementation for ImageDocument.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
Use the right default settings when dealing with image documents.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationcpp">trunk/Source/WebCore/page/ViewportConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebCorepageViewportConfigurationh">trunk/Source/WebCore/page/ViewportConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-10 Benjamin Poulain <bpoulain@apple.com>
+
+ [WK2] Add support for image document viewport configuration
+ https://bugs.webkit.org/show_bug.cgi?id=128565
+
+ Reviewed by Simon Fraser.
+
+ Add proper default settings for displaying images.
+
+ * WebCore.exp.in:
+ * page/ViewportConfiguration.cpp:
+ (WebCore::ViewportConfiguration::imageDocumentParameters):
+ (WebCore::ViewportConfiguration::textDocumentParameters):
+ * page/ViewportConfiguration.h:
+
</ins><span class="cx"> 2014-02-10 Brendan Long <b.long@cablelabs.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed GTK build fix after r163816.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -850,9 +850,10 @@
</span><span class="cx"> __ZN7WebCore21UserContentURLPattern5parseERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration15setContentsSizeERKNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration17webpageParametersEv
</span><del>-__ZN7WebCore21ViewportConfiguration19plainTextParametersEv
</del><span class="cx"> __ZN7WebCore21ViewportConfiguration20setMinimumLayoutSizeERKNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore21ViewportConfiguration20setViewportArgumentsERKNS_17ViewportArgumentsE
</span><ins>+__ZN7WebCore21ViewportConfiguration22textDocumentParametersEv
+__ZN7WebCore21ViewportConfiguration23imageDocumentParametersEv
</ins><span class="cx"> __ZN7WebCore21ViewportConfiguration23setDefaultConfigurationERKNS0_10ParametersE
</span><span class="cx"> __ZN7WebCore21WindowsLatin1EncodingEv
</span><span class="cx"> __ZN7WebCore21createCFURLFromBufferEPKcmPK7__CFURL
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.cpp (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebCore/page/ViewportConfiguration.cpp 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ViewportConfiguration::Parameters ViewportConfiguration::plainTextParameters()
</del><ins>+ViewportConfiguration::Parameters ViewportConfiguration::textDocumentParameters()
</ins><span class="cx"> {
</span><span class="cx"> Parameters parameters;
</span><span class="cx">
</span><span class="lines">@@ -169,6 +169,17 @@
</span><span class="cx"> return parameters;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ViewportConfiguration::Parameters ViewportConfiguration::imageDocumentParameters()
+{
+ Parameters parameters;
+ parameters.width = 980;
+ parameters.widthIsSet = true;
+ parameters.allowsUserScaling = true;
+ parameters.minimumScale = 0.01;
+ parameters.maximumScale = 5;
+ return parameters;
+}
+
</ins><span class="cx"> static inline bool viewportArgumentValueIsValid(float value)
</span><span class="cx"> {
</span><span class="cx"> return value > 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageViewportConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ViewportConfiguration.h (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ViewportConfiguration.h 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebCore/page/ViewportConfiguration.h 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -83,7 +83,8 @@
</span><span class="cx"> bool allowsUserScaling() const { return m_configuration.allowsUserScaling; }
</span><span class="cx">
</span><span class="cx"> static Parameters webpageParameters();
</span><del>- static Parameters plainTextParameters();
</del><ins>+ static Parameters textDocumentParameters();
+ static Parameters imageDocumentParameters();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void updateConfiguration();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-10 Benjamin Poulain <bpoulain@apple.com>
+
+ [WK2] Add support for image document viewport configuration
+ https://bugs.webkit.org/show_bug.cgi?id=128565
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::screenToWindow):
+ (WebKit::PageClientImpl::windowToScreen):
+ Add the implementation for ImageDocument.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad):
+ Use the right default settings when dealing with image documents.
+
</ins><span class="cx"> 2014-02-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Show a debug tile map indicator for UI-side compositing
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebKit2/UIProcess/API/ios/PageClientImplIOS.mm 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -260,14 +260,12 @@
</span><span class="cx">
</span><span class="cx"> IntPoint PageClientImpl::screenToWindow(const IntPoint& point)
</span><span class="cx"> {
</span><del>- notImplemented();
- return IntPoint();
</del><ins>+ return IntPoint([m_view convertPoint:point fromView:nil]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect PageClientImpl::windowToScreen(const IntRect& rect)
</span><span class="cx"> {
</span><del>- notImplemented();
- return IntRect();
</del><ins>+ return enclosingIntRect([m_view convertRect:rect toView:nil]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PageClientImpl::doneWithKeyEvent(const NativeWebKeyboardEvent&, bool)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (163838 => 163839)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-11 00:47:34 UTC (rev 163838)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-02-11 01:10:18 UTC (rev 163839)
</span><span class="lines">@@ -3957,8 +3957,11 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_userHasChangedPageScaleFactor = false;
</span><span class="cx">
</span><del>- if (frame->coreFrame()->document()->isTextDocument())
- m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::plainTextParameters());
</del><ins>+ Document* document = frame->coreFrame()->document();
+ if (document->isImageDocument())
+ m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::imageDocumentParameters());
+ else if (document->isTextDocument())
+ m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::textDocumentParameters());
</ins><span class="cx"> else
</span><span class="cx"> m_viewportConfiguration.setDefaultConfiguration(ViewportConfiguration::webpageParameters());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>