<!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>[180765] 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/180765">180765</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 10:09:46 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Remove remaining SafariTheme cruft
https://bugs.webkit.org/show_bug.cgi?id=142075
Reviewed by Anders Carlsson.
Remove reference to SafariTheme-switching preference.
Source/WebCore:
Tested by existing layout tests.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* config.h:
* page/Settings.cpp:
(WebCore::Settings::fontRenderingMode):
(WebCore::Settings::setShouldPaintNativeControls): Deleted.
* page/Settings.h:
(WebCore::Settings::shouldPaintNativeControls): Deleted.
* platform/win/ScrollbarThemeWin.cpp:
(WebCore::ScrollbarTheme::nativeTheme):
* rendering/RenderThemeWin.cpp:
(WebCore::RenderTheme::themeForPage):
Source/WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl:
* WebKitClassFactory.cpp:
(WebKitClassFactory::WebKitClassFactory):
(WebKitClassFactory::QueryInterface):
(WebKitClassFactory::AddRef):
(WebKitClassFactory::Release):
(WebKitClassFactory::CreateInstance):
(WebKitClassFactory::LockServer):
* WebPreferences.cpp:
(WebPreferences::shouldPaintNativeControls): Deleted.
(WebPreferences::setShouldPaintNativeControls): Deleted.
* WebPreferences.h:
* WebView.cpp:
(WebView::initWithFrame):
(WebView::notifyPreferencesChanged):
Tools:
* DumpRenderTree/win/DumpRenderTree.cpp:
(resetWebPreferencesToConsistentValues):
(prepareConsistentTestingEnvironment):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCorepageSettingscpp">trunk/Source/WebCore/page/Settings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinScrollbarThemeWincpp">trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl">trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebKitClassFactorycpp">trunk/Source/WebKit/win/WebKitClassFactory.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencescpp">trunk/Source/WebKit/win/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebPreferencesh">trunk/Source/WebKit/win/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinDumpRenderTreecpp">trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/ChangeLog 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-02-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove remaining SafariTheme cruft
+ https://bugs.webkit.org/show_bug.cgi?id=142075
+
+ Reviewed by Anders Carlsson.
+
+ Remove reference to SafariTheme-switching preference.
+
+ Tested by existing layout tests.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * config.h:
+ * page/Settings.cpp:
+ (WebCore::Settings::fontRenderingMode):
+ (WebCore::Settings::setShouldPaintNativeControls): Deleted.
+ * page/Settings.h:
+ (WebCore::Settings::shouldPaintNativeControls): Deleted.
+ * platform/win/ScrollbarThemeWin.cpp:
+ (WebCore::ScrollbarTheme::nativeTheme):
+ * rendering/RenderThemeWin.cpp:
+ (WebCore::RenderTheme::themeForPage):
+
</ins><span class="cx"> 2015-02-27 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Add comment about CSS value name mangling
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -8024,7 +8024,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\win\PlatformMouseEventWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\win\PlatformScreenWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\win\PopupMenuWin.cpp" />
</span><del>- <ClCompile Include="..\platform\win\ScrollbarThemeSafari.cpp" />
</del><span class="cx"> <ClCompile Include="..\platform\win\ScrollbarThemeWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\win\SearchPopupMenuWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\win\SharedBufferWin.cpp" />
</span><span class="lines">@@ -11528,7 +11527,6 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\rendering\RenderThemeSafari.cpp" />
</del><span class="cx"> <ClCompile Include="..\rendering\RenderThemeWin.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19591,7 +19589,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\win\PathWalker.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\PEImage.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\PopupMenuWin.h" />
</span><del>- <ClInclude Include="..\platform\win\ScrollbarThemeSafari.h" />
</del><span class="cx"> <ClInclude Include="..\platform\win\ScrollbarThemeWin.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\SearchPopupMenuWin.h" />
</span><span class="cx"> <ClInclude Include="..\platform\win\SoftLinking.h" />
</span><span class="lines">@@ -20394,7 +20391,6 @@
</span><span class="cx"> <ClInclude Include="..\rendering\RenderTextFragment.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\RenderTextLineBoxes.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\RenderTheme.h" />
</span><del>- <CustomBuildStep Include="..\rendering\RenderThemeSafari.h" />
</del><span class="cx"> <CustomBuildStep Include="..\rendering\RenderThemeWin.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\RenderTreeAsText.h" />
</span><span class="cx"> <ClInclude Include="..\rendering\RenderVTTCue.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1269,9 +1269,6 @@
</span><span class="cx"> <ClCompile Include="..\platform\win\PopupMenuWin.cpp">
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\platform\win\ScrollbarThemeSafari.cpp">
- <Filter>platform\win</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\platform\win\ScrollbarThemeWin.cpp">
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -2673,9 +2670,6 @@
</span><span class="cx"> <ClCompile Include="..\rendering\RenderTheme.cpp">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\rendering\RenderThemeSafari.cpp">
- <Filter>rendering</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\rendering\RenderThemeWin.cpp">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -8340,9 +8334,6 @@
</span><span class="cx"> <ClInclude Include="..\platform\win\PopupMenuWin.h">
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\platform\win\ScrollbarThemeSafari.h">
- <Filter>platform\win</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\platform\win\ScrollbarThemeWin.h">
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -15395,9 +15386,6 @@
</span><span class="cx"> <CustomBuildStep Include="..\rendering\RenderMediaControls.h">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </CustomBuildStep>
</span><del>- <CustomBuildStep Include="..\rendering\RenderThemeSafari.h">
- <Filter>rendering</Filter>
- </CustomBuildStep>
</del><span class="cx"> <CustomBuildStep Include="..\rendering\RenderThemeWin.h">
</span><span class="cx"> <Filter>rendering</Filter>
</span><span class="cx"> </CustomBuildStep>
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/config.h 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/config.h 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -116,10 +116,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif /* USE(CG) */
</span><span class="cx">
</span><del>-#if PLATFORM(WIN) && USE(CG)
-#define WTF_USE_SAFARI_THEME 1
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #define WEBCORE_NAVIGATOR_PLATFORM wkGetPlatformNameForNavigator();
</span><span class="cx"> #define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator();
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/page/Settings.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -73,10 +73,6 @@
</span><span class="cx"> double Settings::gDefaultDOMTimerAlignmentInterval = 0;
</span><span class="cx"> double Settings::gHiddenPageDOMTimerAlignmentInterval = 1.0;
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
-bool Settings::gShouldPaintNativeControls = true;
-#endif
-
</del><span class="cx"> #if USE(AVFOUNDATION)
</span><span class="cx"> bool Settings::gAVFoundationEnabled = false;
</span><span class="cx"> #endif
</span><span class="lines">@@ -529,13 +525,6 @@
</span><span class="cx"> return static_cast<FontRenderingMode>(m_fontRenderingMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
-void Settings::setShouldPaintNativeControls(bool shouldPaintNativeControls)
-{
- gShouldPaintNativeControls = shouldPaintNativeControls;
-}
-#endif
-
</del><span class="cx"> void Settings::setDNSPrefetchingEnabled(bool dnsPrefetchingEnabled)
</span><span class="cx"> {
</span><span class="cx"> if (m_dnsPrefetchingEnabled == dnsPrefetchingEnabled)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/page/Settings.h 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -214,12 +214,6 @@
</span><span class="cx">
</span><span class="cx"> static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 512;
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
- // Windows debugging pref (global) for switching between the Aqua look and a native windows look.
- static void setShouldPaintNativeControls(bool);
- static bool shouldPaintNativeControls() { return gShouldPaintNativeControls; }
-#endif
-
</del><span class="cx"> WEBCORE_EXPORT static void setMockScrollbarsEnabled(bool flag);
</span><span class="cx"> WEBCORE_EXPORT static bool mockScrollbarsEnabled();
</span><span class="cx">
</span><span class="lines">@@ -340,9 +334,6 @@
</span><span class="cx"> static bool gMockScrollbarsEnabled;
</span><span class="cx"> static bool gUsesOverlayScrollbars;
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
- static bool gShouldPaintNativeControls;
-#endif
</del><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> static bool gShouldUseHighResolutionTimers;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinScrollbarThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/platform/win/ScrollbarThemeWin.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -87,13 +87,11 @@
</span><span class="cx"> scrollbarTheme = OpenThemeData(0, L"Scrollbar");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(SAFARI_THEME)
</del><span class="cx"> ScrollbarTheme* ScrollbarTheme::nativeTheme()
</span><span class="cx"> {
</span><span class="cx"> static ScrollbarThemeWin winTheme;
</span><span class="cx"> return &winTheme;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> ScrollbarThemeWin::ScrollbarThemeWin()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -187,13 +187,11 @@
</span><span class="cx"> return adoptRef(new RenderThemeWin);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !USE(SAFARI_THEME)
</del><span class="cx"> PassRefPtr<RenderTheme> RenderTheme::themeForPage(Page* page)
</span><span class="cx"> {
</span><span class="cx"> static RenderTheme* winTheme = RenderThemeWin::create().leakRef();
</span><span class="cx"> return winTheme;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RenderThemeWin::RenderThemeWin()
</span><span class="cx"> : m_buttonTheme(0)
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/ChangeLog 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-02-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove remaining SafariTheme cruft
+ https://bugs.webkit.org/show_bug.cgi?id=142075
+
+ Reviewed by Anders Carlsson.
+
+ Remove reference to SafariTheme-switching preference.
+
+ * Interfaces/IWebPreferencesPrivate.idl:
+ * WebKitClassFactory.cpp:
+ (WebKitClassFactory::WebKitClassFactory):
+ (WebKitClassFactory::QueryInterface):
+ (WebKitClassFactory::AddRef):
+ (WebKitClassFactory::Release):
+ (WebKitClassFactory::CreateInstance):
+ (WebKitClassFactory::LockServer):
+ * WebPreferences.cpp:
+ (WebPreferences::shouldPaintNativeControls): Deleted.
+ (WebPreferences::setShouldPaintNativeControls): Deleted.
+ * WebPreferences.h:
+ * WebView.cpp:
+ (WebView::initWithFrame):
+ (WebView::notifyPreferencesChanged):
+
</ins><span class="cx"> 2015-02-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename DatabaseManager::manager() to DatabaseManager::singleton()
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebPreferencesPrivateidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/Interfaces/IWebPreferencesPrivate.idl 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -58,9 +58,6 @@
</span><span class="cx"> HRESULT localStorageDatabasePath([out, retval] BSTR* location);
</span><span class="cx"> HRESULT setLocalStorageDatabasePath([in] BSTR location);
</span><span class="cx">
</span><del>- HRESULT setShouldPaintNativeControls([in] BOOL shouldPaint);
- HRESULT shouldPaintNativeControls([out, retval] BOOL* enabled);
-
</del><span class="cx"> HRESULT setDatabasesEnabled([in] BOOL enabled);
</span><span class="cx"> HRESULT databasesEnabled([out, retval] BOOL *enabled);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitClassFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitClassFactory.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitClassFactory.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/WebKitClassFactory.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014-2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -61,29 +61,10 @@
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="cx"> // WebKitClassFactory ---------------------------------------------------------
</span><del>-#if USE(SAFARI_THEME)
-#ifdef DEBUG_ALL
-SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
-#else
-SOFT_LINK_LIBRARY(SafariTheme)
-#endif
-
-SOFT_LINK(SafariTheme, STInitialize, void, APIENTRY, (), ())
-#endif
-
</del><span class="cx"> WebKitClassFactory::WebKitClassFactory(CLSID targetClass)
</span><span class="cx"> : m_targetClass(targetClass)
</span><span class="cx"> , m_refCount(0)
</span><span class="cx"> {
</span><del>-#if USE(SAFARI_THEME)
- static bool didInitializeSafariTheme;
- if (!didInitializeSafariTheme) {
- if (SafariThemeLibrary())
- STInitialize();
- didInitializeSafariTheme = true;
- }
-#endif
-
</del><span class="cx"> JSC::initializeThreading();
</span><span class="cx"> WTF::initializeMainThread();
</span><span class="cx">
</span><span class="lines">@@ -98,8 +79,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // IUnknown -------------------------------------------------------------------
</span><del>-
-HRESULT STDMETHODCALLTYPE WebKitClassFactory::QueryInterface(REFIID riid, void** ppvObject)
</del><ins>+HRESULT WebKitClassFactory::QueryInterface(REFIID riid, void** ppvObject)
</ins><span class="cx"> {
</span><span class="cx"> *ppvObject = 0;
</span><span class="cx"> if (IsEqualGUID(riid, IID_IUnknown))
</span><span class="lines">@@ -113,12 +93,12 @@
</span><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebKitClassFactory::AddRef(void)
</del><ins>+ULONG WebKitClassFactory::AddRef(void)
</ins><span class="cx"> {
</span><span class="cx"> return ++m_refCount;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ULONG STDMETHODCALLTYPE WebKitClassFactory::Release(void)
</del><ins>+ULONG WebKitClassFactory::Release(void)
</ins><span class="cx"> {
</span><span class="cx"> ULONG newRef = --m_refCount;
</span><span class="cx"> if (!newRef && !gLockCount)
</span><span class="lines">@@ -141,8 +121,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // IClassFactory --------------------------------------------------------------
</span><del>-
-HRESULT STDMETHODCALLTYPE WebKitClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppvObject)
</del><ins>+HRESULT WebKitClassFactory::CreateInstance(IUnknown* pUnkOuter, REFIID riid, void** ppvObject)
</ins><span class="cx"> {
</span><span class="cx"> IUnknown* unknown = 0;
</span><span class="cx"> *ppvObject = 0;
</span><span class="lines">@@ -182,7 +161,7 @@
</span><span class="cx"> return hr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT STDMETHODCALLTYPE WebKitClassFactory::LockServer(BOOL fLock)
</del><ins>+HRESULT WebKitClassFactory::LockServer(BOOL fLock)
</ins><span class="cx"> {
</span><span class="cx"> if (fLock)
</span><span class="cx"> gLockCount++;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/WebPreferences.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1412,18 +1412,6 @@
</span><span class="cx"> return E_FAIL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HRESULT WebPreferences::shouldPaintNativeControls(BOOL* shouldPaint)
-{
- *shouldPaint = boolValueForKey(WebKitPaintNativeControlsPreferenceKey);
- return S_OK;
-}
-
-HRESULT WebPreferences::setShouldPaintNativeControls(BOOL shouldPaint)
-{
- setBoolValue(WebKitPaintNativeControlsPreferenceKey, shouldPaint);
- return S_OK;
-}
-
</del><span class="cx"> HRESULT WebPreferences::setDeveloperExtrasEnabled(BOOL enabled)
</span><span class="cx"> {
</span><span class="cx"> setBoolValue(WebKitDeveloperExtrasEnabledPreferenceKey, enabled);
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebPreferences.h (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebPreferences.h 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/WebPreferences.h 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -377,12 +377,6 @@
</span><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setExperimentalNotificationsEnabled(
</span><span class="cx"> /* [in] */ BOOL enabled);
</span><span class="cx">
</span><del>- virtual HRESULT STDMETHODCALLTYPE setShouldPaintNativeControls(
- /* [in] */ BOOL shouldPaint);
-
- virtual HRESULT STDMETHODCALLTYPE shouldPaintNativeControls(
- /* [retval][out] */ BOOL *shouldPaint);
-
</del><span class="cx"> virtual HRESULT STDMETHODCALLTYPE setZoomsTextOnly(
</span><span class="cx"> /* [retval][out] */ BOOL zoomsTextOnly);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -2788,12 +2788,6 @@
</span><span class="cx"> didOneTimeInitialization = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
- BOOL shouldPaintNativeControls;
- if (SUCCEEDED(m_preferences->shouldPaintNativeControls(&shouldPaintNativeControls)))
- Settings::setShouldPaintNativeControls(shouldPaintNativeControls);
-#endif
-
</del><span class="cx"> BOOL useHighResolutionTimer;
</span><span class="cx"> if (SUCCEEDED(m_preferences->shouldUseHighResolutionTimers(&useHighResolutionTimer)))
</span><span class="cx"> Settings::setShouldUseHighResolutionTimers(useHighResolutionTimer);
</span><span class="lines">@@ -5033,13 +5027,6 @@
</span><span class="cx"> return hr;
</span><span class="cx"> settings.setXSSAuditorEnabled(!!enabled);
</span><span class="cx">
</span><del>-#if USE(SAFARI_THEME)
- hr = prefsPrivate->shouldPaintNativeControls(&enabled);
- if (FAILED(hr))
- return hr;
- settings.setShouldPaintNativeControls(!!enabled);
-#endif
-
</del><span class="cx"> hr = prefsPrivate->shouldUseHighResolutionTimers(&enabled);
</span><span class="cx"> if (FAILED(hr))
</span><span class="cx"> return hr;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Tools/ChangeLog 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-26 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Remove remaining SafariTheme cruft
+ https://bugs.webkit.org/show_bug.cgi?id=142075
+
+ Reviewed by Anders Carlsson.
+
+ Remove reference to SafariTheme-switching preference.
+
+ * DumpRenderTree/win/DumpRenderTree.cpp:
+ (resetWebPreferencesToConsistentValues):
+ (prepareConsistentTestingEnvironment):
+
</ins><span class="cx"> 2015-02-26 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Expose caret browsing preference to accessibility API
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp (180764 => 180765)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-02-27 17:49:22 UTC (rev 180764)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp 2015-02-27 18:09:46 UTC (rev 180765)
</span><span class="lines">@@ -839,7 +839,6 @@
</span><span class="cx"> preferences->setCSSRegionsEnabled(TRUE);
</span><span class="cx"> // Set uses HTML5 parser quirks: NO
</span><span class="cx"> // Async spellcheck: NO
</span><del>- prefsPrivate->setShouldPaintNativeControls(TRUE);
</del><span class="cx"> prefsPrivate->setMockScrollbarsEnabled(TRUE);
</span><span class="cx">
</span><span class="cx"> preferences->setFontSmoothing(FontSmoothingTypeStandard);
</span><span class="lines">@@ -1378,7 +1377,6 @@
</span><span class="cx"> ASSERT(standardPreferencesPrivate);
</span><span class="cx"> standardPreferences->setAutosaves(FALSE);
</span><span class="cx">
</span><del>- standardPreferencesPrivate->setShouldPaintNativeControls(TRUE);
</del><span class="cx"> standardPreferences->setJavaScriptEnabled(TRUE);
</span><span class="cx"> standardPreferences->setDefaultFontSize(16);
</span><span class="cx"> #if USE(CG)
</span></span></pre>
</div>
</div>
</body>
</html>