<!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>[129894] 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/129894">129894</a></dd>
<dt>Author</dt> <dd>haraken@chromium.org</dd>
<dt>Date</dt> <dd>2012-09-28 07:16:15 -0700 (Fri, 28 Sep 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/129825">r129825</a>.
http://trac.webkit.org/changeset/129825
https://bugs.webkit.org/show_bug.cgi?id=97474

DOMWindow.resizeTo() is broken. Asked by Mark Pilgrim.

Source/Platform:

* Platform.gypi:
* chromium/public/WebScreenInfo.h: Removed.

Source/WebCore:

* WebCore.gypi:
* platform/Widget.h:
* platform/chromium/PageClientChromium.h: Removed.
* platform/chromium/PlatformScreenChromium.cpp:
(WebCore::screenHorizontalDPI):
(WebCore::screenVerticalDPI):
(WebCore::screenDepth):
(WebCore::screenDepthPerComponent):
(WebCore::screenIsMonochrome):
(WebCore::screenRect):
(WebCore::screenAvailableRect):
* platform/chromium/PlatformSupport.h:
(PlatformSupport):

Source/WebKit/chromium:

* public/WebScreenInfo.h:
(WebKit):
(WebScreenInfo):
(WebKit::WebScreenInfo::WebScreenInfo):
* src/ChromeClientImpl.cpp:
* src/ChromeClientImpl.h:
(WebKit):
(WebKit::ChromeClientImpl::platformPageClient):
(ChromeClientImpl):
* src/PlatformSupport.cpp:
(WebCore::toWebWidgetClient):
(WebCore):
(WebCore::PlatformSupport::screenHorizontalDPI):
(WebCore::PlatformSupport::screenVerticalDPI):
(WebCore::PlatformSupport::screenDepth):
(WebCore::PlatformSupport::screenDepthPerComponent):
(WebCore::PlatformSupport::screenIsMonochrome):
(WebCore::PlatformSupport::screenRect):
(WebCore::PlatformSupport::screenAvailableRect):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformChangeLog">trunk/Source/Platform/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformPlatformgypi">trunk/Source/Platform/Platform.gypi</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoregypi">trunk/Source/WebCore/WebCore.gypi</a></li>
<li><a href="#trunkSourceWebCoreplatformWidgeth">trunk/Source/WebCore/platform/Widget.h</a></li>
<li><a href="#trunkSourceWebCoreplatformchromiumPlatformScreenChromiumcpp">trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformchromiumPlatformSupporth">trunk/Source/WebCore/platform/chromium/PlatformSupport.h</a></li>
<li><a href="#trunkSourceWebKitchromiumChangeLog">trunk/Source/WebKit/chromium/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitchromiumpublicWebScreenInfoh">trunk/Source/WebKit/chromium/public/WebScreenInfo.h</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcChromeClientImplcpp">trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcChromeClientImplh">trunk/Source/WebKit/chromium/src/ChromeClientImpl.h</a></li>
<li><a href="#trunkSourceWebKitchromiumsrcPlatformSupportcpp">trunk/Source/WebKit/chromium/src/PlatformSupport.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcePlatformchromiumpublicWebScreenInfoh">trunk/Source/Platform/chromium/public/WebScreenInfo.h</a></li>
<li><a href="#trunkSourceWebCoreplatformchromiumPageClientChromiumh">trunk/Source/WebCore/platform/chromium/PageClientChromium.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcePlatformChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/ChangeLog (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/ChangeLog        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/Platform/ChangeLog        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2012-09-28  Kentaro Hara  &lt;haraken@chromium.org&gt;
+
+        Unreviewed, rolling out r129825.
+        http://trac.webkit.org/changeset/129825
+        https://bugs.webkit.org/show_bug.cgi?id=97474
+
+        DOMWindow.resizeTo() is broken. Asked by Mark Pilgrim.
+
+        * Platform.gypi:
+        * chromium/public/WebScreenInfo.h: Removed.
+
</ins><span class="cx"> 2012-09-28  Yoshifumi Inoue  &lt;yosin@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         [Forms] Add localized strings for multiple fields date/time input UI
</span></span></pre></div>
<a id="trunkSourcePlatformPlatformgypi"></a>
<div class="modfile"><h4>Modified: trunk/Source/Platform/Platform.gypi (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/Platform.gypi        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/Platform/Platform.gypi        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx">             'chromium/public/WebRect.h',
</span><span class="cx">             'chromium/public/WebReferrerPolicy.h',
</span><span class="cx">             'chromium/public/WebRenderingStats.h',
</span><del>-            'chromium/public/WebScreenInfo.h',
</del><span class="cx">             'chromium/public/WebScrollbar.h',
</span><span class="cx">             'chromium/public/WebScrollbarLayer.h',
</span><span class="cx">             'chromium/public/WebScrollbarThemeGeometry.h',
</span></span></pre></div>
<a id="trunkSourcePlatformchromiumpublicWebScreenInfoh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/Platform/chromium/public/WebScreenInfo.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/Platform/chromium/public/WebScreenInfo.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/Platform/chromium/public/WebScreenInfo.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -1,82 +0,0 @@
</span><del>-/*
- * Copyright (C) 2009 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY 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.
- */
-
-#ifndef WebScreenInfo_h
-#define WebScreenInfo_h
-
-#include &quot;WebRect.h&quot;
-
-namespace WebKit {
-
-struct WebScreenInfo {
-    // The horizontal screen dpi.
-    int horizontalDPI;
-
-    // The vertical screen dpi.
-    int verticalDPI;
-
-    // The screen depth in bits per pixel
-    int depth;
-
-    // The bits per colour component. This assumes that the colours are balanced
-    // equally.
-    int depthPerComponent;
-
-    // This can be true for black and white printers
-    bool isMonochrome;
-
-    // This is set from the rcMonitor member of MONITORINFOEX, to whit:
-    //   &quot;A RECT structure that specifies the display monitor rectangle,
-    //   expressed in virtual-screen coordinates. Note that if the monitor
-    //   is not the primary display monitor, some of the rectangle's
-    //   coordinates may be negative values.&quot;
-    WebRect rect;
-
-    // This is set from the rcWork member of MONITORINFOEX, to whit:
-    //   &quot;A RECT structure that specifies the work area rectangle of the
-    //   display monitor that can be used by applications, expressed in
-    //   virtual-screen coordinates. Windows uses this rectangle to
-    //   maximize an application on the monitor. The rest of the area in
-    //   rcMonitor contains system windows such as the task bar and side
-    //   bars. Note that if the monitor is not the primary display monitor,
-    //   some of the rectangle's coordinates may be negative values&quot;.
-    WebRect availableRect;
-
-    WebScreenInfo()
-        : horizontalDPI(0)
-        , verticalDPI(0)
-        , depth(0)
-        , depthPerComponent(0)
-        , isMonochrome(false) { }
-};
-
-} // namespace WebKit
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/ChangeLog        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2012-09-28  Kentaro Hara  &lt;haraken@chromium.org&gt;
+
+        Unreviewed, rolling out r129825.
+        http://trac.webkit.org/changeset/129825
+        https://bugs.webkit.org/show_bug.cgi?id=97474
+
+        DOMWindow.resizeTo() is broken. Asked by Mark Pilgrim.
+
+        * WebCore.gypi:
+        * platform/Widget.h:
+        * platform/chromium/PageClientChromium.h: Removed.
+        * platform/chromium/PlatformScreenChromium.cpp:
+        (WebCore::screenHorizontalDPI):
+        (WebCore::screenVerticalDPI):
+        (WebCore::screenDepth):
+        (WebCore::screenDepthPerComponent):
+        (WebCore::screenIsMonochrome):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        * platform/chromium/PlatformSupport.h:
+        (PlatformSupport):
+
</ins><span class="cx"> 2012-09-28  Christophe Dumez  &lt;christophe.dumez@intel.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WebDatabase] Error code should be CONSTRAINT_ERR if a statement fails due to a constraint failure
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoregypi"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.gypi (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.gypi        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/WebCore.gypi        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -4672,7 +4672,6 @@
</span><span class="cx">             'platform/chromium/LinkHashChromium.cpp',
</span><span class="cx">             'platform/chromium/MemoryUsageSupportChromium.cpp',
</span><span class="cx">             'platform/chromium/MIMETypeRegistryChromium.cpp',
</span><del>-            'platform/chromium/PageClientChromium.h',
</del><span class="cx">             'platform/chromium/PasteboardChromium.cpp',
</span><span class="cx">             'platform/chromium/PlatformCursor.h',
</span><span class="cx">             'platform/chromium/PlatformKeyboardEventChromium.cpp',
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformWidgeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Widget.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Widget.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/platform/Widget.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(CHROMIUM)
</span><del>-#include &quot;PageClientChromium.h&quot;
</del><span class="cx"> #include &quot;PlatformWidget.h&quot;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="lines">@@ -94,8 +93,6 @@
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> class PageClientEfl;
</span><span class="cx"> typedef PageClientEfl* PlatformPageClient;
</span><del>-#elif PLATFORM(CHROMIUM)
-typedef WebCore::PageClientChromium* PlatformPageClient;
</del><span class="cx"> #else
</span><span class="cx"> typedef PlatformWidget PlatformPageClient;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformchromiumPageClientChromiumh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/chromium/PageClientChromium.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/chromium/PageClientChromium.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/platform/chromium/PageClientChromium.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (c) 2012, Google Inc. All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY 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.
- */
-
-#ifndef PageClientChromium_h
-#define PageClientChromium_h
-
-#include &lt;public/WebScreenInfo.h&gt;
-
-namespace WebCore {
-
-class PageClientChromium {
-public:
-    virtual WebKit::WebScreenInfo screenInfo() = 0;
-};
-
-} // namespace WebCore
-
-#endif // PageClientChromium_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformchromiumPlatformScreenChromiumcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/platform/chromium/PlatformScreenChromium.cpp        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -31,82 +31,46 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;PlatformScreen.h&quot;
</span><span class="cx"> 
</span><del>-#include &quot;FloatRect.h&quot;
-#include &quot;HostWindow.h&quot;
-#include &quot;ScrollView.h&quot;
-#include &quot;Widget.h&quot;
</del><ins>+#include &quot;IntRect.h&quot;
+#include &quot;PlatformSupport.h&quot;
+
</ins><span class="cx"> #include &lt;public/Platform.h&gt;
</span><del>-#include &lt;public/WebScreenInfo.h&gt;
</del><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-static PlatformPageClient toPlatformPageClient(Widget* widget)
-{
-    if (!widget)
-        return 0;
-    ScrollView* root = widget-&gt;root();
-    if (!root)
-        return 0;
-    HostWindow* hostWindow = root-&gt;hostWindow();
-    if (!hostWindow)
-        return 0;
-    return hostWindow-&gt;platformPageClient();
-}
-
</del><span class="cx"> int screenHorizontalDPI(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return 0;
-    return client-&gt;screenInfo().horizontalDPI;
</del><ins>+    return PlatformSupport::screenHorizontalDPI(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int screenVerticalDPI(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return 0;
-    return client-&gt;screenInfo().verticalDPI;
</del><ins>+    return PlatformSupport::screenVerticalDPI(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int screenDepth(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return 0;
-    return client-&gt;screenInfo().depth;
</del><ins>+    return PlatformSupport::screenDepth(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> int screenDepthPerComponent(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return 0;
-    return client-&gt;screenInfo().depthPerComponent;
</del><ins>+    return PlatformSupport::screenDepthPerComponent(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool screenIsMonochrome(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return 0;
-    return client-&gt;screenInfo().isMonochrome;
</del><ins>+    return PlatformSupport::screenIsMonochrome(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenRect(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return IntRect();
-    return IntRect(client-&gt;screenInfo().rect);
</del><ins>+    return PlatformSupport::screenRect(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FloatRect screenAvailableRect(Widget* widget)
</span><span class="cx"> {
</span><del>-    PlatformPageClient client = toPlatformPageClient(widget);
-    if (!client)
-        return IntRect();
-    return IntRect(client-&gt;screenInfo().availableRect);
</del><ins>+    return PlatformSupport::screenAvailableRect(widget);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void screenColorProfile(ColorProfile&amp; toProfile)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformchromiumPlatformSupporth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/chromium/PlatformSupport.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/chromium/PlatformSupport.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebCore/platform/chromium/PlatformSupport.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -98,6 +98,15 @@
</span><span class="cx">     static bool plugins(bool refresh, Vector&lt;PluginInfo&gt;*);
</span><span class="cx">     static NPObject* pluginScriptableObject(Widget*);
</span><span class="cx"> 
</span><ins>+    // Screen -------------------------------------------------------------
+    static int screenHorizontalDPI(Widget*);
+    static int screenVerticalDPI(Widget*);
+    static int screenDepth(Widget*);
+    static int screenDepthPerComponent(Widget*);
+    static bool screenIsMonochrome(Widget*);
+    static IntRect screenRect(Widget*);
+    static IntRect screenAvailableRect(Widget*);
+
</ins><span class="cx">     // Theming ------------------------------------------------------------
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">     static void paintButton(
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/ChangeLog (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/ChangeLog        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebKit/chromium/ChangeLog        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2012-09-28  Kentaro Hara  &lt;haraken@chromium.org&gt;
+
+        Unreviewed, rolling out r129825.
+        http://trac.webkit.org/changeset/129825
+        https://bugs.webkit.org/show_bug.cgi?id=97474
+
+        DOMWindow.resizeTo() is broken. Asked by Mark Pilgrim.
+
+        * public/WebScreenInfo.h:
+        (WebKit):
+        (WebScreenInfo):
+        (WebKit::WebScreenInfo::WebScreenInfo):
+        * src/ChromeClientImpl.cpp:
+        * src/ChromeClientImpl.h:
+        (WebKit):
+        (WebKit::ChromeClientImpl::platformPageClient):
+        (ChromeClientImpl):
+        * src/PlatformSupport.cpp:
+        (WebCore::toWebWidgetClient):
+        (WebCore):
+        (WebCore::PlatformSupport::screenHorizontalDPI):
+        (WebCore::PlatformSupport::screenVerticalDPI):
+        (WebCore::PlatformSupport::screenDepth):
+        (WebCore::PlatformSupport::screenDepthPerComponent):
+        (WebCore::PlatformSupport::screenIsMonochrome):
+        (WebCore::PlatformSupport::screenRect):
+        (WebCore::PlatformSupport::screenAvailableRect):
+
</ins><span class="cx"> 2012-09-27  Alexander Pavlov  &lt;apavlov@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: [Device Metrics] Remove the gutter overlay moving its functionality into the InspectorOverlay
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumpublicWebScreenInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/public/WebScreenInfo.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/public/WebScreenInfo.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebKit/chromium/public/WebScreenInfo.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -28,4 +28,55 @@
</span><span class="cx">  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">  */
</span><span class="cx"> 
</span><del>-#include &quot;../../../Platform/chromium/public/WebScreenInfo.h&quot;
</del><ins>+#ifndef WebScreenInfo_h
+#define WebScreenInfo_h
+
+#include &quot;platform/WebRect.h&quot;
+
+namespace WebKit {
+
+struct WebScreenInfo {
+    // The horizontal screen dpi.
+    int horizontalDPI;
+
+    // The vertical screen dpi.
+    int verticalDPI;
+
+    // The screen depth in bits per pixel
+    int depth;
+
+    // The bits per colour component. This assumes that the colours are balanced
+    // equally.
+    int depthPerComponent;
+
+    // This can be true for black and white printers
+    bool isMonochrome;
+
+    // This is set from the rcMonitor member of MONITORINFOEX, to whit:
+    //   &quot;A RECT structure that specifies the display monitor rectangle,
+    //   expressed in virtual-screen coordinates. Note that if the monitor
+    //   is not the primary display monitor, some of the rectangle's
+    //   coordinates may be negative values.&quot;
+    WebRect rect;
+
+    // This is set from the rcWork member of MONITORINFOEX, to whit:
+    //   &quot;A RECT structure that specifies the work area rectangle of the
+    //   display monitor that can be used by applications, expressed in
+    //   virtual-screen coordinates. Windows uses this rectangle to
+    //   maximize an application on the monitor. The rest of the area in
+    //   rcMonitor contains system windows such as the task bar and side
+    //   bars. Note that if the monitor is not the primary display monitor,
+    //   some of the rectangle's coordinates may be negative values&quot;.
+    WebRect availableRect;
+
+    WebScreenInfo()
+        : horizontalDPI(0)
+        , verticalDPI(0)
+        , depth(0)
+        , depthPerComponent(0)
+        , isMonochrome(false) { }
+};
+
+} // namespace WebKit
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcChromeClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -902,12 +902,6 @@
</span><span class="cx">         m_webView-&gt;client()-&gt;postAccessibilityNotification(WebAccessibilityObject(obj), toWebAccessibilityNotification(notification));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-WebKit::WebScreenInfo ChromeClientImpl::screenInfo()
-{
-    return m_webView-&gt;client()-&gt;screenInfo();
-}
-
-
</del><span class="cx"> bool ChromeClientImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect&amp; horizontalOverhangArea, const IntRect&amp; verticalOverhangArea, const IntRect&amp; dirtyRect)
</span><span class="cx"> {
</span><span class="cx">     Frame* frame = m_webView-&gt;mainFrameImpl()-&gt;frame();
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcChromeClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/ChromeClientImpl.h (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/ChromeClientImpl.h        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebKit/chromium/src/ChromeClientImpl.h        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -60,11 +60,10 @@
</span><span class="cx"> class WebColorChooserClient;
</span><span class="cx"> class WebViewImpl;
</span><span class="cx"> struct WebCursorInfo;
</span><del>-struct WebScreenInfo;
</del><span class="cx"> struct WebPopupMenuInfo;
</span><span class="cx"> 
</span><span class="cx"> // Handles window-level notifications from WebCore on behalf of a WebView.
</span><del>-class ChromeClientImpl : public WebCore::ChromeClientChromium, public WebCore::PageClientChromium {
</del><ins>+class ChromeClientImpl : public WebCore::ChromeClientChromium {
</ins><span class="cx"> public:
</span><span class="cx">     explicit ChromeClientImpl(WebViewImpl* webView);
</span><span class="cx">     virtual ~ChromeClientImpl();
</span><span class="lines">@@ -124,7 +123,7 @@
</span><span class="cx">         const WebCore::IntRect&amp; clipRect);
</span><span class="cx">     virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&amp;) const;
</span><span class="cx">     virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&amp;) const;
</span><del>-    virtual PlatformPageClient platformPageClient() const { return PlatformPageClient(this); }
</del><ins>+    virtual PlatformPageClient platformPageClient() const { return 0; }
</ins><span class="cx">     virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::IntSize&amp;) const;
</span><span class="cx">     virtual void layoutUpdated(WebCore::Frame*) const;
</span><span class="cx">     virtual void scrollRectIntoView(
</span><span class="lines">@@ -195,9 +194,6 @@
</span><span class="cx">     virtual void popupClosed(WebCore::PopupContainer* popupContainer);
</span><span class="cx">     virtual void postAccessibilityNotification(WebCore::AccessibilityObject*, WebCore::AXObjectCache::AXNotification);
</span><span class="cx"> 
</span><del>-    // PageClientChromium methods:
-    virtual WebScreenInfo screenInfo();
-
</del><span class="cx">     // ChromeClientImpl:
</span><span class="cx">     void setCursorForPlugin(const WebCursorInfo&amp;);
</span><span class="cx">     void setNewWindowNavigationPolicy(WebNavigationPolicy);
</span></span></pre></div>
<a id="trunkSourceWebKitchromiumsrcPlatformSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/chromium/src/PlatformSupport.cpp (129893 => 129894)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/chromium/src/PlatformSupport.cpp        2012-09-28 14:12:48 UTC (rev 129893)
+++ trunk/Source/WebKit/chromium/src/PlatformSupport.cpp        2012-09-28 14:16:15 UTC (rev 129894)
</span><span class="lines">@@ -100,6 +100,30 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><ins>+static WebWidgetClient* toWebWidgetClient(Widget* widget)
+{
+    if (!widget)
+        return 0;
+
+    FrameView* view;
+    if (widget-&gt;isFrameView())
+        view = static_cast&lt;FrameView*&gt;(widget);
+    else if (widget-&gt;parent() &amp;&amp; widget-&gt;parent()-&gt;isFrameView())
+        view = static_cast&lt;FrameView*&gt;(widget-&gt;parent());
+    else
+        return 0;
+
+    Page* page = view-&gt;frame() ? view-&gt;frame()-&gt;page() : 0;
+    if (!page)
+        return 0;
+
+    void* webView = page-&gt;chrome()-&gt;client()-&gt;webView();
+    if (!webView)
+        return 0;
+
+    return static_cast&lt;WebViewImpl*&gt;(webView)-&gt;client();
+}
+
</ins><span class="cx"> static WebCookieJar* getCookieJar(const Document* document)
</span><span class="cx"> {
</span><span class="cx">     WebFrameImpl* frameImpl = WebFrameImpl::fromFrame(document-&gt;frame());
</span><span class="lines">@@ -306,6 +330,62 @@
</span><span class="cx"> // Glue layer. Once the Glue layer moves entirely into the WebKit layer, these
</span><span class="cx"> // methods will be deleted.
</span><span class="cx"> 
</span><ins>+int PlatformSupport::screenHorizontalDPI(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return 0;
+    return client-&gt;screenInfo().horizontalDPI;
+}
+
+int PlatformSupport::screenVerticalDPI(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return 0;
+    return client-&gt;screenInfo().verticalDPI;
+}
+
+int PlatformSupport::screenDepth(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return 0;
+    return client-&gt;screenInfo().depth;
+}
+
+int PlatformSupport::screenDepthPerComponent(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return 0;
+    return client-&gt;screenInfo().depthPerComponent;
+}
+
+bool PlatformSupport::screenIsMonochrome(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return 0;
+    return client-&gt;screenInfo().isMonochrome;
+}
+
+IntRect PlatformSupport::screenRect(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return IntRect();
+    return client-&gt;screenInfo().rect;
+}
+
+IntRect PlatformSupport::screenAvailableRect(Widget* widget)
+{
+    WebWidgetClient* client = toWebWidgetClient(widget);
+    if (!client)
+        return IntRect();
+    return client-&gt;screenInfo().availableRect;
+}
+
</ins><span class="cx"> #if ENABLE(WORKERS)
</span><span class="cx"> WorkerContextProxy* WorkerContextProxy::create(Worker* worker)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>

</body>
</html>