<!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>[178849] 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/178849">178849</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 10:59:08 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] eventSender does not support scalePageBy
https://bugs.webkit.org/show_bug.cgi?id=140726
<rdar://problem/19549865>
Reviewed by Dean Jackson.
Source/WebKit/win:
* Interfaces/IWebViewPrivate.idl: Add scaleWebView API.
* WebView.cpp:
(WebView::scaleWebView):
Connect WebCore implementation to the Windows COM interface.
* WebView.h:
Tools:
* DumpRenderTree/win/EventSender.cpp:
(scalePageByCallback): Provide implementation using new WebView method.
LayoutTests:
* platform/win/TestExpectations: Unskip test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwinTestExpectations">trunk/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebViewPrivateidl">trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebViewh">trunk/Source/WebKit/win/WebView.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinEventSendercpp">trunk/Tools/DumpRenderTree/win/EventSender.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/LayoutTests/ChangeLog 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-01-21 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ [Win] eventSender does not support scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=140726
+ <rdar://problem/19549865>
+
+ Reviewed by Dean Jackson.
+
+ * platform/win/TestExpectations: Unskip test.
+
+2015-01-21 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Unreviewed gardening after reactivating some tests.
</span><span class="cx">
</span><span class="cx"> * platform/win/TestExpectations: Add failure entries for a few tests with bug reports.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/win/TestExpectations (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/TestExpectations 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/LayoutTests/platform/win/TestExpectations 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1335,9 +1335,6 @@
</span><span class="cx"> fast/harness/results.html [ Failure ]
</span><span class="cx"> fast/images/support-broken-image-delegate.html [ Failure ]
</span><span class="cx"> fast/repaint/canvas-putImageData.html [ Failure ]
</span><del>-fast/repaint/fixed-in-page-scale.html [ Failure ]
-fast/repaint/fixed-right-bottom-in-page-scale.html [ Failure ]
-fast/repaint/fixed-right-in-page-scale.html [ Failure ]
</del><span class="cx"> fast/repaint/moving-shadow-on-container.html [ Failure ]
</span><span class="cx"> fast/repaint/moving-shadow-on-path.html [ Failure ]
</span><span class="cx"> # media/controls-after-reload.html [ Failure ]
</span><span class="lines">@@ -1584,7 +1581,6 @@
</span><span class="cx"> compositing/iframes/fixed-position-iframe.html [ Failure ]
</span><span class="cx"> compositing/tiling/huge-layer-add-remove-child.html [ Failure ]
</span><span class="cx"> compositing/tiling/huge-layer-resize.html [ Failure ]
</span><del>-compositing/tiling/tile-cache-zoomed.html [ Failure ]
</del><span class="cx">
</span><span class="cx"> # Inspector Protocol
</span><span class="cx"> webkit.org/b/140510 inspector-protocol/debugger/terminate-dedicated-worker-while-paused.html [ Crash ]
</span><span class="lines">@@ -1789,7 +1785,6 @@
</span><span class="cx"> webkit.org/b/117322 fast/backgrounds/background-opaque-images-over-color.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/css/font-weight-1.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/css/margin-top-bottom-dynamic.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/117322 fast/css/sticky/sticky-top-zoomed.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/117322 fast/css/text-indent-first-line-006.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/117322 fast/css/word-spacing-characters-complex-text.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/117322 fast/selectors/selection-window-inactive.html [ ImageOnlyFailure ]
</span><span class="lines">@@ -2958,4 +2953,3 @@
</span><span class="cx"> webkit.org/b/140724 css2.1/t1202-counter-04-b.html [ Failure ]
</span><span class="cx"> webkit.org/b/140724 css2.1/t1202-counters-04-b.html [ Failure ]
</span><span class="cx"> webkit.org/b/140725 fast/dom/34176.html [ Failure ]
</span><del>-webkit.org/b/140726 fast/dom/zoom-scroll-page-test.html [ Failure ]
</del></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Source/WebKit/win/ChangeLog 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-01-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] eventSender does not support scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=140726
+ <rdar://problem/19549865>
+
+ Reviewed by Dean Jackson.
+
+ * Interfaces/IWebViewPrivate.idl: Add scaleWebView API.
+ * WebView.cpp:
+ (WebView::scaleWebView):
+ Connect WebCore implementation to the Windows COM interface.
+ * WebView.h:
+
</ins><span class="cx"> 2015-01-21 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(INSPECTOR) ifdef guards
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebViewPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Source/WebKit/win/Interfaces/IWebViewPrivate.idl 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -293,4 +293,6 @@
</span><span class="cx">
</span><span class="cx"> // SPI for DumpRenderTree
</span><span class="cx"> HRESULT setLoadResourcesSerially([in] BOOL serialize);
</span><ins>+
+ HRESULT scaleWebView([in] double scale, [in] POINT origin);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -7038,3 +7038,13 @@
</span><span class="cx"> resourceLoadScheduler()->setSerialLoadingEnabled(serialize);
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><ins>+
+HRESULT WebView::scaleWebView(double scale, POINT origin)
+{
+ if (!m_page)
+ return E_FAIL;
+
+ m_page->setPageScaleFactor(scale, origin);
+
+ return S_OK;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.h (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.h 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Source/WebKit/win/WebView.h 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1020,6 +1020,7 @@
</span><span class="cx"> void setShouldInvertColors(bool);
</span><span class="cx">
</span><span class="cx"> HRESULT STDMETHODCALLTYPE setLoadResourcesSerially(BOOL);
</span><ins>+ HRESULT STDMETHODCALLTYPE scaleWebView(double scale, POINT origin);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> static bool registerWebViewWindowClass();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Tools/ChangeLog 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-21 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] eventSender does not support scalePageBy
+ https://bugs.webkit.org/show_bug.cgi?id=140726
+ <rdar://problem/19549865>
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/win/EventSender.cpp:
+ (scalePageByCallback): Provide implementation using new WebView method.
+
</ins><span class="cx"> 2015-01-21 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove Apple Mountain Lion Build & Test slaves.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinEventSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/EventSender.cpp (178848 => 178849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/EventSender.cpp 2015-01-21 18:55:00 UTC (rev 178848)
+++ trunk/Tools/DumpRenderTree/win/EventSender.cpp 2015-01-21 18:59:08 UTC (rev 178849)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2007, 2008, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2012 Baidu Inc. All rights reserved
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -751,6 +751,35 @@
</span><span class="cx"> return JSValueMakeUndefined(context);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static JSValueRef scalePageByCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
+{
+ if (argumentCount < 1)
+ return JSValueMakeUndefined(context);
+
+ COMPtr<IWebView> webView;
+ if (FAILED(frame->webView(&webView)))
+ return JSValueMakeUndefined(context);
+
+ COMPtr<IWebViewPrivate> webViewPrivate;
+ if (FAILED(webView->QueryInterface(&webViewPrivate)))
+ return JSValueMakeUndefined(context);
+
+ POINT origin;
+ origin.x = 0;
+ origin.y = 0;
+
+ double scale = JSValueToNumber(context, arguments[0], exception);
+
+ if (argumentCount > 1)
+ origin.x = JSValueToNumber(context, arguments[1], exception);
+ if (argumentCount > 2)
+ origin.y = JSValueToNumber(context, arguments[2], exception);
+
+ webViewPrivate->scaleWebView(scale, origin);
+
+ return JSValueMakeUndefined(context);
+}
+
</ins><span class="cx"> static JSStaticFunction staticFunctions[] = {
</span><span class="cx"> { "contextClick", contextClickCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "mouseDown", mouseDownCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="lines">@@ -764,6 +793,7 @@
</span><span class="cx"> { "zoomPageIn", zoomPageInCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "zoomPageOut", zoomPageOutCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><span class="cx"> { "beginDragWithFiles", beginDragWithFilesCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</span><ins>+ { "scalePageBy", scalePageByCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
</ins><span class="cx"> { 0, 0, 0 }
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>