<!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>[173126] trunk/Tools</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/173126">173126</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 15:55:27 -0700 (Fri, 29 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove Windows WebKit2 code from TestWebKitAPI
https://bugs.webkit.org/show_bug.cgi?id=136385

Reviewed by Alexey Proskuryakov.

* TestWebKitAPI/PlatformUtilities.h:
* TestWebKitAPI/PlatformWebView.h:
(TestWebKitAPI::PlatformWebView::setParentWindowMessageObserver): Deleted.
* TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
(TestWebKitAPI::TEST): Deleted.
* TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
(TestWebKitAPI::TEST):
* TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/HideFindIndicator.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp: Removed.
* TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp: Removed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformUtilitiesh">trunk/Tools/TestWebKitAPI/PlatformUtilities.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformWebViewh">trunk/Tools/TestWebKitAPI/PlatformWebView.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2MouseMoveAfterCrashcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2SpacebarScrollingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2WKPreferencescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li>trunk/Tools/TestWebKitAPI/Tests/WebKit2/win/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/ChangeLog        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-08-29  Tim Horton  &lt;timothy_horton@apple.com&gt;
+
+        Remove Windows WebKit2 code from TestWebKitAPI
+        https://bugs.webkit.org/show_bug.cgi?id=136385
+
+        Reviewed by Alexey Proskuryakov.
+
+        * TestWebKitAPI/PlatformUtilities.h:
+        * TestWebKitAPI/PlatformWebView.h:
+        (TestWebKitAPI::PlatformWebView::setParentWindowMessageObserver): Deleted.
+        * TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp:
+        (TestWebKitAPI::TEST): Deleted.
+        * TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp:
+        (TestWebKitAPI::TEST):
+        * TestWebKitAPI/Tests/WebKit2/win/AltKeyGeneratesWMSysCommand.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/DoNotCopyANullCFURLResponse.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/HideFindIndicator.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/ResizeViewWhileHidden.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/TranslateMessageGeneratesWMChar.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/WMCloseCallsUIClientClose.cpp: Removed.
+        * TestWebKitAPI/Tests/WebKit2/win/WMPrint.cpp: Removed.
+
</ins><span class="cx"> 2014-08-29  Carlos Alberto Lopez Perez  &lt;clopez@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [JSC] Some JSC tests are dependent on the machine time zone.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformUtilities.h (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformUtilities.h        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/TestWebKitAPI/PlatformUtilities.h        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -40,10 +40,6 @@
</span><span class="cx"> // Runs a platform runloop until the 'done' is true. 
</span><span class="cx"> void run(bool* done);
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-bool shouldTranslateMessage(const MSG&amp;);
-#endif
-
</del><span class="cx"> void sleep(double seconds);
</span><span class="cx"> 
</span><span class="cx"> WKContextRef createContextWithInjectedBundle();
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformWebView.h (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformWebView.h        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/TestWebKitAPI/PlatformWebView.h        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -40,9 +40,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> typedef WKView *PlatformWKView;
</span><span class="cx"> typedef NSWindow *PlatformWindow;
</span><del>-#elif defined(WIN32) || defined(_WIN32)
-typedef WKViewRef PlatformWKView;
-typedef HWND PlatformWindow;
</del><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef WKViewRef PlatformWKView;
</span><span class="cx"> typedef GtkWidget *PlatformWindow;
</span><span class="lines">@@ -53,10 +50,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-class WindowMessageObserver;
-#endif
-
</del><span class="cx"> class PlatformWebView {
</span><span class="cx"> public:
</span><span class="cx">     PlatformWebView(WKContextRef, WKPageGroupRef = 0);
</span><span class="lines">@@ -72,23 +65,9 @@
</span><span class="cx">     void simulateRightClick(unsigned x, unsigned y);
</span><span class="cx">     void simulateMouseMove(unsigned x, unsigned y);
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-    void simulateAKeyDown();
-    void setParentWindowMessageObserver(WindowMessageObserver* observer) { m_parentWindowMessageObserver = observer; }
-#endif
-
</del><span class="cx"> private:
</span><del>-#if PLATFORM(WIN)
-    static void registerWindowClass();
-    static LRESULT CALLBACK wndProc(HWND, UINT message, WPARAM, LPARAM);
-#endif
-
</del><span class="cx">     PlatformWKView m_view;
</span><span class="cx">     PlatformWindow m_window;
</span><del>-
-#if PLATFORM(WIN)
-    WindowMessageObserver* m_parentWindowMessageObserver;
-#endif
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2MouseMoveAfterCrashcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/MouseMoveAfterCrash.cpp        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -48,11 +48,7 @@
</span><span class="cx">     WKPageSetPageLoaderClient(page, &amp;loaderClient.base);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-TEST(WebKit2, DISABLED_MouseMoveAfterCrash)
-#else
</del><span class="cx"> TEST(WebKit2, MouseMoveAfterCrash)
</span><del>-#endif
</del><span class="cx"> {
</span><span class="cx">     WKRetainPtr&lt;WKContextRef&gt; context = adoptWK(Util::createContextForInjectedBundleTest(&quot;MouseMoveAfterCrashTest&quot;));
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2SpacebarScrollingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/SpacebarScrolling.cpp        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -86,13 +86,11 @@
</span><span class="cx">     EXPECT_JS_FALSE(webView.page(), &quot;isDocumentScrolled()&quot;);
</span><span class="cx">     EXPECT_JS_TRUE(webView.page(), &quot;textFieldContainsSpace()&quot;);
</span><span class="cx"> 
</span><del>-    // On Mac, a key down event represents both a raw key down and a key press. On Windows, a key
-    // down event only represents a raw key down. We expect the key press to be handled (because it
-    // inserts text into the text field). But the raw key down should not be handled.
</del><ins>+    // On Mac, a key down event represents both a raw key down and a key press.
+    // We expect the key press to be handled (because it inserts text into the text field),
+    // but the raw key down should not be handled.
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_FALSE(didNotHandleKeyDownEvent);
</span><del>-#elif PLATFORM(WIN)
-    EXPECT_TRUE(didNotHandleKeyDownEvent);
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     EXPECT_JS_EQ(webView.page(), &quot;blurTextField()&quot;, &quot;undefined&quot;);
</span><span class="lines">@@ -100,17 +98,11 @@
</span><span class="cx">     didNotHandleKeyDownEvent = false;
</span><span class="cx">     webView.simulateSpacebarKeyPress();
</span><span class="cx"> 
</span><del>-    // This EXPECT_JS_TRUE test fails on Windows port
-    // https://bugs.webkit.org/show_bug.cgi?id=84961
-#if !PLATFORM(WIN)
</del><span class="cx">     EXPECT_JS_TRUE(webView.page(), &quot;isDocumentScrolled()&quot;);
</span><del>-#endif
</del><span class="cx">     EXPECT_JS_TRUE(webView.page(), &quot;textFieldContainsSpace()&quot;);
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">     EXPECT_FALSE(didNotHandleKeyDownEvent);
</span><del>-#elif PLATFORM(WIN)
-    EXPECT_TRUE(didNotHandleKeyDownEvent);
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2WKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp (173125 => 173126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp        2014-08-29 22:52:51 UTC (rev 173125)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/WKPreferences.cpp        2014-08-29 22:55:27 UTC (rev 173126)
</span><span class="lines">@@ -41,15 +41,7 @@
</span><span class="cx"> 
</span><span class="cx"> TEST(WebKit2, WKPreferencesDefaults)
</span><span class="cx"> {
</span><del>-#if PLATFORM(WIN)
-    static const char* expectedStandardFontFamily = &quot;Times New Roman&quot;;
-    static const char* expectedFixedFontFamily = &quot;Courier New&quot;;
-    static const char* expectedSerifFontFamily = &quot;Times New Roman&quot;;
-    static const char* expectedSansSerifFontFamily = &quot;Arial&quot;;
-    static const char* expectedCursiveFontFamily = &quot;Comic Sans MS&quot;;
-    static const char* expectedFantasyFontFamily = &quot;Comic Sans MS&quot;;
-    static const char* expectedPictographFontFamily = &quot;Times New Roman&quot;;
-#elif PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">     static const char* expectedStandardFontFamily = &quot;Times&quot;;
</span><span class="cx">     static const char* expectedFixedFontFamily = &quot;Courier&quot;;
</span><span class="cx">     static const char* expectedSerifFontFamily = &quot;Times&quot;;
</span><span class="lines">@@ -99,11 +91,7 @@
</span><span class="cx">     EXPECT_FALSE(WKPreferencesGetDeveloperExtrasEnabled(preference));
</span><span class="cx">     EXPECT_TRUE(WKPreferencesGetTextAreasAreResizable(preference));
</span><span class="cx"> 
</span><del>-#if PLATFORM(WIN)
-    EXPECT_EQ(kWKFontSmoothingLevelWindows, WKPreferencesGetFontSmoothingLevel(preference));
-#else
</del><span class="cx">     EXPECT_EQ(kWKFontSmoothingLevelMedium, WKPreferencesGetFontSmoothingLevel(preference));
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     EXPECT_TRUE(WKPreferencesGetAcceleratedCompositingEnabled(preference));
</span><span class="cx">     EXPECT_FALSE(WKPreferencesGetCompositingBordersVisible(preference));
</span></span></pre>
</div>
</div>

</body>
</html>