<!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>[168327] trunk</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/168327">168327</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-05 16:35:38 -0700 (Mon, 05 May 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clean up Image Document and tweak the layout and viewport
https://bugs.webkit.org/show_bug.cgi?id=132552


Source/WebCore: 
Reviewed by Sam Weinig.

The #ifdef in every function was making quite a mess. A lot of that code does
not make sense on iOS.

This patch make a clean split between mouse related stuff and iOS.

Also:
-Change the viewport to be only width based, and avoid scaling in portrait.
-Center the image horizontally in the view.

* html/ImageDocument.cpp:
(WebCore::ImageDocument::ImageDocument):
(WebCore::ImageDocument::createDocumentStructure):
(WebCore::ImageDocument::imageUpdated):
(WebCore::ImageDocument::scale):
(WebCore::ImageDocument::resizeImageToFit):
(WebCore::ImageDocument::imageFitsInWindow):
(WebCore::ImageDocument::windowSizeChanged):
(WebCore::ImageDocument::imageClicked):
* html/ImageDocument.h:

Tools: 
Reviewed by Anders Carlsson.

* DumpRenderTree/mac/DumpRenderTree.mm:
(resetWebPreferencesToConsistentValues):
Update the default settings to have something consistent with WebKit2.

LayoutTests: 
Reviewed by Anders Carlsson.

* svg/custom/anchor-on-use-expected.svg:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestssvgcustomanchoronuseexpectedsvg">trunk/LayoutTests/svg/custom/anchor-on-use-expected.svg</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDocumentcpp">trunk/Source/WebCore/html/ImageDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlImageDocumenth">trunk/Source/WebCore/html/ImageDocument.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/LayoutTests/ChangeLog        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-05-05  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
+
+        Clean up Image Document and tweak the layout and viewport
+        https://bugs.webkit.org/show_bug.cgi?id=132552
+
+        Reviewed by Anders Carlsson.
+
+        * svg/custom/anchor-on-use-expected.svg:
+
</ins><span class="cx"> 2014-05-05  Christophe Dumez  &lt;ch.dumez@samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Named element cache can become invalid during HTMLCollection::updateNamedElementCache()
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomanchoronuseexpectedsvg"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/svg/custom/anchor-on-use-expected.svg (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/anchor-on-use-expected.svg        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/LayoutTests/svg/custom/anchor-on-use-expected.svg        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><span class="cx"> &lt;svg xmlns=&quot;http://www.w3.org/2000/svg&quot; xmlns:xlink=&quot;http://www.w3.org/1999/xlink&quot;&gt;
</span><del>-    &lt;image x=&quot;0&quot; y=&quot;0&quot; width=&quot;503&quot; height=&quot;410&quot; xlink:href=&quot;resources/green-checker.png&quot;/&gt;
</del><ins>+    &lt;image x=&quot;50%&quot; y=&quot;0&quot; transform=&quot;translate(-251,0)&quot; width=&quot;503&quot; height=&quot;410&quot; xlink:href=&quot;resources/green-checker.png&quot;/&gt;
</ins><span class="cx"> &lt;/svg&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/Source/WebCore/ChangeLog        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-05-05  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
+
+        Clean up Image Document and tweak the layout and viewport
+        https://bugs.webkit.org/show_bug.cgi?id=132552
+
+        Reviewed by Sam Weinig.
+
+        The #ifdef in every function was making quite a mess. A lot of that code does
+        not make sense on iOS.
+
+        This patch make a clean split between mouse related stuff and iOS.
+
+        Also:
+        -Change the viewport to be only width based, and avoid scaling in portrait.
+        -Center the image horizontally in the view.
+
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocument::ImageDocument):
+        (WebCore::ImageDocument::createDocumentStructure):
+        (WebCore::ImageDocument::imageUpdated):
+        (WebCore::ImageDocument::scale):
+        (WebCore::ImageDocument::resizeImageToFit):
+        (WebCore::ImageDocument::imageFitsInWindow):
+        (WebCore::ImageDocument::windowSizeChanged):
+        (WebCore::ImageDocument::imageClicked):
+        * html/ImageDocument.h:
+
</ins><span class="cx"> 2014-05-05  Beth Dakin  &lt;bdakin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Need a delegate that informs the UI process when the page's pin state changes
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageDocument.cpp (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageDocument.cpp        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/Source/WebCore/html/ImageDocument.cpp        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include &quot;ImageDocument.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;CachedImage.h&quot;
</span><ins>+#include &quot;Chrome.h&quot;
</ins><span class="cx"> #include &quot;DocumentLoader.h&quot;
</span><span class="cx"> #include &quot;EventListener.h&quot;
</span><span class="cx"> #include &quot;EventNames.h&quot;
</span><span class="lines">@@ -50,6 +51,7 @@
</span><span class="cx"> 
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx"> class ImageEventListener final : public EventListener {
</span><span class="cx"> public:
</span><span class="cx">     static PassRefPtr&lt;ImageEventListener&gt; create(ImageDocument&amp; document) { return adoptRef(new ImageEventListener(document)); }
</span><span class="lines">@@ -66,7 +68,8 @@
</span><span class="cx"> 
</span><span class="cx">     ImageDocument&amp; m_document;
</span><span class="cx"> };
</span><del>-    
</del><ins>+#endif
+
</ins><span class="cx"> class ImageDocumentParser final : public RawDataDocumentParser {
</span><span class="cx"> public:
</span><span class="cx">     static PassRefPtr&lt;ImageDocumentParser&gt; create(ImageDocument&amp; document)
</span><span class="lines">@@ -191,7 +194,9 @@
</span><span class="cx">     : HTMLDocument(&amp;frame, url, ImageDocumentClass)
</span><span class="cx">     , m_imageElement(nullptr)
</span><span class="cx">     , m_imageSizeIsKnown(false)
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">     , m_didShrinkImage(false)
</span><ins>+#endif
</ins><span class="cx">     , m_shouldShrinkImage(frame.settings().shrinksStandaloneImagesToFit() &amp;&amp; frame.isMainFrame())
</span><span class="cx"> {
</span><span class="cx">     setCompatibilityMode(QuirksMode);
</span><span class="lines">@@ -216,32 +221,57 @@
</span><span class="cx">     rootElement-&gt;appendChild(body);
</span><span class="cx">     
</span><span class="cx">     RefPtr&lt;ImageDocumentElement&gt; imageElement = ImageDocumentElement::create(*this);
</span><del>-    imageElement-&gt;setAttribute(styleAttr, &quot;-webkit-user-select: none&quot;);        
</del><ins>+    if (m_shouldShrinkImage)
+        imageElement-&gt;setAttribute(styleAttr, &quot;-webkit-user-select:none; display:block; margin:auto;&quot;);
+    else
+        imageElement-&gt;setAttribute(styleAttr, &quot;-webkit-user-select:none;&quot;);
</ins><span class="cx">     imageElement-&gt;setLoadManually(true);
</span><span class="cx">     imageElement-&gt;setSrc(url().string());
</span><span class="cx">     body-&gt;appendChild(imageElement);
</span><span class="cx">     
</span><span class="cx">     if (m_shouldShrinkImage) {
</span><ins>+#if PLATFORM(IOS)
+        // Set the viewport to be in device pixels (rather than the default of 980).
+        processViewport(ASCIILiteral(&quot;width=device-width&quot;), ViewportArguments::ImageDocument);
+#else
</ins><span class="cx">         RefPtr&lt;EventListener&gt; listener = ImageEventListener::create(*this);
</span><span class="cx">         if (DOMWindow* window = this-&gt;domWindow())
</span><span class="cx">             window-&gt;addEventListener(&quot;resize&quot;, listener, false);
</span><span class="cx">         imageElement-&gt;addEventListener(&quot;click&quot;, listener.release(), false);
</span><del>-
-#if PLATFORM(IOS)
-        // Set the viewport to be in device pixels (rather than the default of 980).
-        processViewport(ASCIILiteral(&quot;width=device-width&quot;), ViewportArguments::ImageDocument);
</del><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     m_imageElement = imageElement.get();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-float ImageDocument::scale()
</del><ins>+void ImageDocument::imageUpdated()
</ins><span class="cx"> {
</span><ins>+    ASSERT(m_imageElement);
+
+    if (m_imageSizeIsKnown)
+        return;
+
+    LayoutSize imageSize = this-&gt;imageSize();
+    if (imageSize.isEmpty())
+        return;
+
+    m_imageSizeIsKnown = true;
+
+    if (m_shouldShrinkImage) {
</ins><span class="cx"> #if PLATFORM(IOS)
</span><del>-    // On iOS big images are subsampled to make them smaller. So, don't resize them.
-    return 1;
</del><ins>+        FloatSize screenSize = page()-&gt;chrome().screenSize();
+        if (imageSize.width() &gt; screenSize.width())
+            processViewport(String::format(&quot;width=%u&quot;, static_cast&lt;unsigned&gt;(imageSize.width().toInt())), ViewportArguments::ImageDocument);
</ins><span class="cx"> #else
</span><ins>+        // Call windowSizeChanged for its side effect of sizing the image.
+        windowSizeChanged();
+#endif
+    }
+}
+
+#if !PLATFORM(IOS)
+float ImageDocument::scale()
+{
</ins><span class="cx">     if (!m_imageElement)
</span><span class="cx">         return 1;
</span><span class="cx"> 
</span><span class="lines">@@ -255,14 +285,10 @@
</span><span class="cx">     float heightScale = view-&gt;height() / imageSize.height().toFloat();
</span><span class="cx"> 
</span><span class="cx">     return std::min(widthScale, heightScale);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ImageDocument::resizeImageToFit()
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
-    // On iOS big images are subsampled to make them smaller. So, don't resize them.
-#else
</del><span class="cx">     if (!m_imageElement)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -273,57 +299,8 @@
</span><span class="cx">     m_imageElement-&gt;setHeight(static_cast&lt;int&gt;(imageSize.height() * scale));
</span><span class="cx"> 
</span><span class="cx">     m_imageElement-&gt;setInlineStyleProperty(CSSPropertyCursor, CSSValueWebkitZoomIn);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><del>-void ImageDocument::imageClicked(int x, int y)
-{
-#if PLATFORM(IOS)
-    // On iOS big images are subsampled to make them smaller. So, don't resize them.
-    UNUSED_PARAM(x);
-    UNUSED_PARAM(y);
-#else
-    if (!m_imageSizeIsKnown || imageFitsInWindow())
-        return;
-
-    m_shouldShrinkImage = !m_shouldShrinkImage;
-
-    if (m_shouldShrinkImage) {
-        // Call windowSizeChanged for its side effect of sizing the image.
-        windowSizeChanged();
-    } else {
-        restoreImageSize();
-
-        updateLayout();
-
-        float scale = this-&gt;scale();
-
-        int scrollX = static_cast&lt;int&gt;(x / scale - view()-&gt;width() / 2.0f);
-        int scrollY = static_cast&lt;int&gt;(y / scale - view()-&gt;height() / 2.0f);
-
-        view()-&gt;setScrollPosition(IntPoint(scrollX, scrollY));
-    }
-#endif
-}
-
-void ImageDocument::imageUpdated()
-{
-    ASSERT(m_imageElement);
-    
-    if (m_imageSizeIsKnown)
-        return;
-
-    if (imageSize().isEmpty())
-        return;
-    
-    m_imageSizeIsKnown = true;
-
-    if (m_shouldShrinkImage) {
-        // Call windowSizeChanged for its side effect of sizing the image.
-        windowSizeChanged();
-    }
-}
-
</del><span class="cx"> void ImageDocument::restoreImageSize()
</span><span class="cx"> {
</span><span class="cx">     if (!m_imageElement || !m_imageSizeIsKnown)
</span><span class="lines">@@ -351,14 +328,11 @@
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><span class="cx">     LayoutSize imageSize = this-&gt;imageSize();
</span><del>-#if PLATFORM(IOS)
-    LayoutSize windowSize = view-&gt;contentsToScreen(view-&gt;visibleContentRect()).size();
-#else
</del><span class="cx">     LayoutSize windowSize = LayoutSize(view-&gt;width(), view-&gt;height());
</span><del>-#endif
</del><span class="cx">     return imageSize.width() &lt;= windowSize.width() &amp;&amp; imageSize.height() &lt;= windowSize.height();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> void ImageDocument::windowSizeChanged()
</span><span class="cx"> {
</span><span class="cx">     if (!m_imageElement || !m_imageSizeIsKnown)
</span><span class="lines">@@ -366,20 +340,6 @@
</span><span class="cx"> 
</span><span class="cx">     bool fitsInWindow = imageFitsInWindow();
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS)
-    if (fitsInWindow)
-        return;
-
-    LayoutSize imageSize = this-&gt;imageSize();
-    LayoutRect visibleScreenSize = view()-&gt;contentsToScreen(view()-&gt;visibleContentRect());
-
-    float widthScale = static_cast&lt;float&gt;(visibleScreenSize.width()) / imageSize.width();
-    float heightScale = static_cast&lt;float&gt;(visibleScreenSize.height()) / imageSize.height();
-    if (widthScale &lt; heightScale)
-        processViewport(String::format(&quot;width=%d&quot;, imageSize.width().toInt()), ViewportArguments::ImageDocument);
-    else
-        processViewport(String::format(&quot;width=%d&quot;, static_cast&lt;int&gt;(1.0f + (1.0f - heightScale)) * imageSize.width().toInt()), ViewportArguments::ImageDocument);
-#else
</del><span class="cx">     // If the image has been explicitly zoomed in, restore the cursor if the image fits
</span><span class="cx">     // and set it to a zoom out cursor if the image doesn't fit
</span><span class="cx">     if (!m_shouldShrinkImage) {
</span><span class="lines">@@ -404,9 +364,32 @@
</span><span class="cx">             m_didShrinkImage = true;
</span><span class="cx">         }
</span><span class="cx">     }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void ImageDocument::imageClicked(int x, int y)
+{
+    if (!m_imageSizeIsKnown || imageFitsInWindow())
+        return;
+
+    m_shouldShrinkImage = !m_shouldShrinkImage;
+
+    if (m_shouldShrinkImage) {
+        // Call windowSizeChanged for its side effect of sizing the image.
+        windowSizeChanged();
+    } else {
+        restoreImageSize();
+
+        updateLayout();
+
+        float scale = this-&gt;scale();
+
+        int scrollX = static_cast&lt;int&gt;(x / scale - view()-&gt;width() / 2.0f);
+        int scrollY = static_cast&lt;int&gt;(y / scale - view()-&gt;height() / 2.0f);
+
+        view()-&gt;setScrollPosition(IntPoint(scrollX, scrollY));
+    }
+}
+
</ins><span class="cx"> void ImageEventListener::handleEvent(ScriptExecutionContext*, Event* event)
</span><span class="cx"> {
</span><span class="cx">     if (event-&gt;type() == eventNames().resizeEvent)
</span><span class="lines">@@ -422,6 +405,7 @@
</span><span class="cx">     // All ImageEventListener objects compare as equal; OK since there is only one per document.
</span><span class="cx">     return other.type() == ImageEventListenerType;
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> // --------
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlImageDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/ImageDocument.h (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/ImageDocument.h        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/Source/WebCore/html/ImageDocument.h        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -46,8 +46,10 @@
</span><span class="cx"> 
</span><span class="cx">     void disconnectImageElement() { m_imageElement = nullptr; }
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">     void windowSizeChanged();
</span><span class="cx">     void imageClicked(int x, int y);
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     ImageDocument(Frame&amp;, const URL&amp;);
</span><span class="lines">@@ -57,10 +59,12 @@
</span><span class="cx">     LayoutSize imageSize();
</span><span class="cx"> 
</span><span class="cx">     void createDocumentStructure();
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">     void resizeImageToFit();
</span><span class="cx">     void restoreImageSize();
</span><span class="cx">     bool imageFitsInWindow();
</span><span class="cx">     float scale();
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     void imageUpdated();
</span><span class="cx"> 
</span><span class="lines">@@ -69,8 +73,10 @@
</span><span class="cx">     // Whether enough of the image has been loaded to determine its size.
</span><span class="cx">     bool m_imageSizeIsKnown;
</span><span class="cx"> 
</span><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">     // Whether the image is shrunk to fit or not.
</span><span class="cx">     bool m_didShrinkImage;
</span><ins>+#endif
</ins><span class="cx"> 
</span><span class="cx">     // Whether the image should be shrunk or not.
</span><span class="cx">     bool m_shouldShrinkImage;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/Tools/ChangeLog        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-05  Benjamin Poulain  &lt;benjamin@webkit.org&gt;
+
+        Clean up Image Document and tweak the layout and viewport
+        https://bugs.webkit.org/show_bug.cgi?id=132552
+
+        Reviewed by Anders Carlsson.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (resetWebPreferencesToConsistentValues):
+        Update the default settings to have something consistent with WebKit2.
+
</ins><span class="cx"> 2014-05-05  Martin Robinson  &lt;mrobinson@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK][CMake] Unable to do make install
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (168326 => 168327)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2014-05-05 23:24:09 UTC (rev 168326)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2014-05-05 23:35:38 UTC (rev 168327)
</span><span class="lines">@@ -839,6 +839,7 @@
</span><span class="cx"> 
</span><span class="cx">     [preferences setPrivateBrowsingEnabled:NO];
</span><span class="cx">     [preferences setAuthorAndUserStylesEnabled:YES];
</span><ins>+    [preferences setShrinksStandaloneImagesToFit:YES];
</ins><span class="cx">     [preferences setJavaScriptCanOpenWindowsAutomatically:YES];
</span><span class="cx">     [preferences setJavaScriptCanAccessClipboard:YES];
</span><span class="cx">     [preferences setOfflineWebApplicationCacheEnabled:YES];
</span></span></pre>
</div>
</div>

</body>
</html>