<!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>[211698] branches/safari-603-branch</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/211698">211698</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-02-05 21:25:04 -0800 (Sun, 05 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/211207">r211207</a>. rdar://problem/30154036</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchSourceWebKitmacChangeLog">branches/safari-603-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitmacWebViewWebViewmm">branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinChangeLog">branches/safari-603-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebKitwinWebViewcpp">branches/safari-603-branch/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#branchessafari603branchToolsChangeLog">branches/safari-603-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari603branchToolsTestWebKitAPIPlatformWincmake">branches/safari-603-branch/Tools/TestWebKitAPI/PlatformWin.cmake</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchToolsTestWebKitAPITestsWebKitwinScaleWebViewcpp">branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit/win/ScaleWebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211207. rdar://problem/30154036
+
+ 2017-01-26 Per Arne Vollan <pvollan@apple.com>
+
+ Crash when setting custom scale factor.
+ https://bugs.webkit.org/show_bug.cgi?id=167369
+
+ Reviewed by Sam Weinig.
+
+ Add null pointer check.
+
+ * WebView/WebView.mm:
+ (-[WebView _setCustomBackingScaleFactor:]):
+
</ins><span class="cx"> 2017-01-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211243. rdar://problem/30149809
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Source/WebKit/mac/WebView/WebView.mm 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -4944,7 +4944,7 @@
</span><span class="cx">
</span><span class="cx"> _private->customDeviceScaleFactor = customScaleFactor;
</span><span class="cx">
</span><del>- if (oldScaleFactor != [self _deviceScaleFactor])
</del><ins>+ if (_private->page && oldScaleFactor != [self _deviceScaleFactor])
</ins><span class="cx"> _private->page->setDeviceScaleFactor([self _deviceScaleFactor]);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/ChangeLog (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Source/WebKit/win/ChangeLog 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211207. rdar://problem/30154036
+
+ 2017-01-26 Per Arne Vollan <pvollan@apple.com>
+
+ Crash when setting custom scale factor.
+ https://bugs.webkit.org/show_bug.cgi?id=167369
+
+ Reviewed by Sam Weinig.
+
+ Add null pointer check.
+
+ * WebView.cpp:
+ (WebView::setCustomBackingScaleFactor):
+
</ins><span class="cx"> 2017-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210949. rdar://problem/30108531
</span></span></pre></div>
<a id="branchessafari603branchSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebKit/win/WebView.cpp (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Source/WebKit/win/WebView.cpp 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -7754,7 +7754,7 @@
</span><span class="cx">
</span><span class="cx"> m_customDeviceScaleFactor = customScaleFactor;
</span><span class="cx">
</span><del>- if (oldScaleFactor != deviceScaleFactor())
</del><ins>+ if (m_page && oldScaleFactor != deviceScaleFactor())
</ins><span class="cx"> m_page->setDeviceScaleFactor(deviceScaleFactor());
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="branchessafari603branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/ChangeLog (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/ChangeLog 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Tools/ChangeLog 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2017-02-05 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r211207. rdar://problem/30154036
+
+ 2017-01-26 Per Arne Vollan <pvollan@apple.com>
+
+ Crash when setting custom scale factor.
+ https://bugs.webkit.org/show_bug.cgi?id=167369
+
+ Reviewed by Sam Weinig.
+
+ Added API test.
+
+ * TestWebKitAPI/PlatformWin.cmake:
+ * TestWebKitAPI/Tests/WebKit/win/ScaleWebView.cpp: Added.
+ (TestWebKitAPI::WebKitCreateInstance):
+ (TestWebKitAPI::ScaleWebView::SetUp):
+ (TestWebKitAPI::ScaleWebView::TearDown):
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-02-02 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r211526. rdar://problem/30301498
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPIPlatformWincmake"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Tools/TestWebKitAPI/PlatformWin.cmake (211697 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/PlatformWin.cmake 2017-02-06 04:56:09 UTC (rev 211697)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/PlatformWin.cmake 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -139,6 +139,7 @@
</span><span class="cx"> add_library(TestWebKitLib SHARED
</span><span class="cx"> ${test_main_SOURCES}
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/TestsController.cpp
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WebKit/win/ScaleWebView.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WebKit/win/WebViewDestruction.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/win/HostWindow.cpp
</span><span class="cx"> )
</span></span></pre></div>
<a id="branchessafari603branchToolsTestWebKitAPITestsWebKitwinScaleWebViewcpp"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit/win/ScaleWebView.cpp (0 => 211698)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit/win/ScaleWebView.cpp (rev 0)
+++ branches/safari-603-branch/Tools/TestWebKitAPI/Tests/WebKit/win/ScaleWebView.cpp 2017-02-06 05:25:04 UTC (rev 211698)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple 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:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 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 APPLE INC. OR ITS 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.
+ */
+
+#include "config.h"
+
+#include "HostWindow.h"
+#include "Test.h"
+#include <WebCore/COMPtr.h>
+#include <WebKit/WebKit.h>
+#include <WebKit/WebKitCOMAPI.h>
+
+namespace TestWebKitAPI {
+
+template <typename T>
+static HRESULT WebKitCreateInstance(REFCLSID clsid, T** object)
+{
+ return WebKitCreateInstance(clsid, 0, __uuidof(T), reinterpret_cast<void**>(object));
+}
+
+class ScaleWebView : public ::testing::Test {
+protected:
+ virtual void SetUp();
+ virtual void TearDown();
+
+ COMPtr<IWebView> m_webView;
+ HostWindow m_window;
+};
+
+void ScaleWebView::SetUp()
+{
+ EXPECT_HRESULT_SUCCEEDED(WebKitCreateInstance(__uuidof(WebView), &m_webView));
+ EXPECT_TRUE(m_window.initialize());
+ EXPECT_HRESULT_SUCCEEDED(m_webView->setHostWindow(m_window.window()));
+}
+
+void ScaleWebView::TearDown()
+{
+ m_webView = 0;
+}
+
+// Tests that scaling a WebView before calling IWebView::initWithFrame doesn't crash.
+TEST_F(ScaleWebView, ScaleBeforeInitWithFrame)
+{
+ COMPtr<IWebViewPrivate2> viewPrivate(Query, m_webView);
+ ASSERT_NOT_NULL(viewPrivate);
+ EXPECT_HRESULT_SUCCEEDED(viewPrivate->setCustomBackingScaleFactor(2));
+ EXPECT_HRESULT_SUCCEEDED(m_webView->initWithFrame(m_window.clientRect(), 0, 0));
+}
+
+} // namespace WebKitAPITest
</ins></span></pre>
</div>
</div>
</body>
</html>