Bulk fixes to get Mac Test Shell more compile-happy.

webkit/tools/test_shell/test_shell.h

 /*
  * Copyright (C) 2006 Apple Computer, 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 COMPUTER, INC. ``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 COMPUTER, INC. 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 WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H__
-#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H__
+#ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
+#define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
 
 #pragma once
 
 #include <string>
 #include <list>
 
+#include "base/basictypes.h"
+#include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "webkit/tools/test_shell/event_sending_controller.h"
 #include "webkit/tools/test_shell/layout_test_controller.h"
 #include "webkit/tools/test_shell/resource.h"
 #include "webkit/tools/test_shell/text_input_controller.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 #include "webkit/tools/test_shell/webview_host.h"
 #include "webkit/tools/test_shell/webwidget_host.h"
 
-typedef std::list<HWND> WindowList;
+typedef std::list<gfx::WindowHandle> WindowList;
 
 struct WebPreferences;
 class TestNavigationEntry;
 class TestNavigationController;
 
 class TestShell {
 public:
     struct TestParams {
       // Load the test defaults.
       TestParams() : dump_tree(true), dump_pixels(false) {
@@ skipping 83 matching lines @@
     void LoadURLForFrame(const wchar_t* url, const wchar_t* frame_name);
     void GoBackOrForward(int offset);
     void Reload();
     bool Navigate(const TestNavigationEntry& entry, bool reload);
 
     bool PromptForSaveFile(const wchar_t* prompt_title, std::wstring* result);
     std::wstring GetDocumentText();
     void DumpDocumentText();
     void DumpRenderTree();
 
-    HWND mainWnd() const { return m_mainWnd; }
-    HWND webViewWnd() const { return m_webViewHost->window_handle(); }
-    HWND editWnd() const { return m_editWnd; }
-    HWND popupWnd() const { return m_popupHost->window_handle(); }
+    gfx::WindowHandle mainWnd() const { return m_mainWnd; }
+    gfx::ViewHandle webViewWnd() const { return m_webViewHost->window_handle(); }
+    gfx::EditViewHandle editWnd() const { return m_editWnd; }
+    gfx::ViewHandle popupWnd() const { return m_popupHost->window_handle(); }
 
     static WindowList* windowList() { return window_list_; }
 
     // If shell is non-null, then *shell is assigned upon successful return
     static bool CreateNewWindow(const std::wstring& startingURL,
                                 TestShell** shell = NULL);
 
     // Implements CreateWebView for TestWebViewDelegate, which in turn
     // is called as a WebViewDelegate.
     WebView* CreateWebView(WebView* webview);
     WebWidget* CreatePopupWidget(WebView* webview);
     void ClosePopup();
 
+#if defined(OS_WIN)
     static ATOM RegisterWindowClass();
+#endif
 
     // Called by the WebView delegate WindowObjectCleared() method, this 
     // binds the layout_test_controller_ and other C++ controller classes to
     // window JavaScript objects so they can be accessed by layout tests.
     virtual void BindJSObjectsToWindow(WebFrame* frame);
 
     // Runs a layout test.  Loads a single file into the first available
     // window, then dumps the requested text representation to stdout.  
     // Returns false if the test cannot be run because no windows are open.
     static bool RunFileTest(const char* filename, const TestParams& params);
@@ skipping 15 matching lines @@
     static std::string RewriteLocalUrl(const std::string& url);
 
     // Set the timeout for running a test.
     static void SetFileTestTimeout(int timeout_ms) {
       file_test_timeout_ms_ = timeout_ms;
     }
 
     // Get the timeout for running a test.
     static int GetFileTestTimeout() { return file_test_timeout_ms_; }
 
+#if defined(OS_WIN)
     // Access to the finished event.  Used by the static WatchDog
     // thread.
     HANDLE finished_event() { return finished_event_; }
+#endif
 
     // Have the shell print the StatsTable to stdout on teardown.
     void DumpStatsTableOnExit() { dump_stats_table_on_exit_ = true; }
 
     void CallJSGC();
 
     void set_is_modal(bool value) { is_modal_ = value; }
     bool is_modal() const { return is_modal_; }
 
 protected:
     bool Initialize(const std::wstring& startingURL);
     void SizeToDefault();
     void SizeTo(int width, int height);
     void ResizeSubViews();
 
+#if defined(OS_WIN)
     static LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
     static LRESULT CALLBACK EditWndProc(HWND, UINT, WPARAM, LPARAM);
+#endif
 
 protected:
-    HWND                    m_mainWnd;
-    HWND                    m_editWnd;
+    gfx::WindowHandle       m_mainWnd;
+    gfx::EditViewHandle     m_editWnd;
     scoped_ptr<WebViewHost> m_webViewHost;
     WebWidgetHost*          m_popupHost;
+#if defined(OS_WIN)
     WNDPROC                 default_edit_wnd_proc_;
+#endif
 
     // Primitive focus controller for layout test mode.
     WebWidgetHost*          m_focusedWidgetHost;
 
 private:
     // A set of all our windows.
     static WindowList* window_list_;
+#if defined(OS_MACOSX)
+    static std::map<gfx::WindowHandle, TestShell *> window_map_;
+#endif
 
+#if defined(OS_WIN)
     static HINSTANCE instance_handle_;
+#endif
 
     // False when the app is being run using the --layout-tests switch.
     static bool interactive_;
 
     // Timeout for page load when running non-interactive file tests, in ms.
     static int file_test_timeout_ms_;
 
     scoped_ptr<LayoutTestController> layout_test_controller_;
 
     scoped_ptr<EventSendingController> event_sending_controller_;
     
     scoped_ptr<TextInputController> text_input_controller_;
 
     scoped_ptr<TestNavigationController> navigation_controller_;
 
     scoped_refptr<TestWebViewDelegate> delegate_;
 
     // True while a test is preparing to run
     bool test_is_preparing_;
 
     // True while a test is running
     bool test_is_pending_;
 
     // True if driven from a nested message loop.
     bool is_modal_;
 
     // The preferences for the test shell.
     static WebPreferences* web_prefs_;
 
+#if defined(OS_WIN)
     // Used by the watchdog to know when it's finished.
     HANDLE finished_event_;
+#endif
 
     // Dump the stats table counters on exit.
     bool dump_stats_table_on_exit_;
 };
 
-#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H__
+#endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_