2006-03-01 Eric Seidel <eseidel@apple.com>

        Reviewed by NOBODY (OOPS!).

        Make spinneret take advantage of the new GraphicsContextCairo.

        * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp:
        (main): updated to match style guidelines.
        * Spinneret/Spinneret/Spinneret.cpp:
        (_tWinMain):
        * Spinneret/Spinneret/WebView.cpp:
        (WebKit::registerWebViewWithInstance):
        (WebKit::WebView::WebView):
        (WebKit::WebView::~WebView):
        (WebKit::WebView::drawRect):
        (WebKit::WndProc):
        * Spinneret/Spinneret/WebView.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 03b616c6e9543bf36aae9b6ec23ef04d70843b06..320124d6962e78b327929a21bfae95e03a159bc9 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,21 @@
+2006-03-01  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by andersca.
+
+        Make spinneret take advantage of the new GraphicsContextCairo.
+
+        * DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp:
+        (main): updated to match style guidelines.
+        * Spinneret/Spinneret/Spinneret.cpp:
+        (_tWinMain):
+        * Spinneret/Spinneret/WebView.cpp:
+        (WebKit::registerWebViewWithInstance):
+        (WebKit::WebView::WebView):
+        (WebKit::WebView::~WebView):
+        (WebKit::WebView::drawRect):
+        (WebKit::WndProc):
+        * Spinneret/Spinneret/WebView.h:
+
 2006-03-01  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by darin

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
index 81c6170f7135eaafaf32bafa67a1a8c6417666f2..b5869e86972828525470e0b86b311f80629b488d 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.vcproj/DumpRenderTree/DumpRenderTree.cpp
@@ -45,16 +45,16 @@ using namespace WebCore;
 
 int main(int argc, char* argv[])
 {
-    Page *page = new Page();
-    FrameWin *frame = new FrameWin(page, 0);
-    FrameView *frameView = new FrameView(frame);
+    Page* page = new Page();
+    FrameWin* frame = new FrameWin(page, 0);
+    FrameView* frameView = new FrameView(frame);
     frame->setView(frameView);
     
     frame->begin();
 
 #if LOCAL_FILE_TEST
-    char *path = "c:\\cygwin\\tmp\\test.html";
-    FILE *file = fopen(path, "rb");
+    char* path = "c:\\cygwin\\tmp\\test.html";
+    FILE* file = fopen(path, "rb");
     if (!file) {
         printf("Failed to open file: %s\n", path);
         printf("Current path: %s\n", _getcwd(0,0));

diff --git a/WebKitTools/Spinneret/Spinneret/Spinneret.cpp b/WebKitTools/Spinneret/Spinneret/Spinneret.cpp
index a90045cd2a7f06fb46cede20a13fe413f58cd457..5efdaadede6d8a889e86aad9bbf1e789732aaad0 100755 (executable)
--- a/WebKitTools/Spinneret/Spinneret/Spinneret.cpp
+++ b/WebKitTools/Spinneret/Spinneret/Spinneret.cpp
@@ -67,7 +67,7 @@ int APIENTRY _tWinMain(HINSTANCE hInstance,
 \r
     gWebView = WebView::createWebView(hInstance, hMainWnd);\r
     ShowWindow(gWebView->windowHandle(), nCmdShow);\r
-    UpdateWindow(gWebView->windowHandle());    \r
+    UpdateWindow(gWebView->windowHandle());\r
 \r
     hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDC_SPINNERET));\r
 \r

diff --git a/WebKitTools/Spinneret/Spinneret/WebView.cpp b/WebKitTools/Spinneret/Spinneret/WebView.cpp
index 168d6bd080486025c2641b0afbdbc1b55ee3eab8..3d816ff6439b971a38934c34cc3335d3de0fcbc1 100755 (executable)
--- a/WebKitTools/Spinneret/Spinneret/WebView.cpp
+++ b/WebKitTools/Spinneret/Spinneret/WebView.cpp
@@ -69,16 +69,16 @@ static ATOM registerWebViewWithInstance(HINSTANCE hInstance)
 \r
     wcex.cbSize = sizeof(WNDCLASSEX);\r
 \r
-    wcex.style            = CS_HREDRAW | CS_VREDRAW; // CS_DBLCLKS?\r
+    wcex.style          = CS_HREDRAW | CS_VREDRAW; // CS_DBLCLKS?\r
     wcex.lpfnWndProc    = WndProc;\r
-    wcex.cbClsExtra        = 0;\r
-    wcex.cbWndExtra        = 0;\r
-    wcex.hInstance        = hInstance;\r
-    wcex.hIcon            = 0;\r
+    wcex.cbClsExtra     = 0;\r
+    wcex.cbWndExtra     = 0;\r
+    wcex.hInstance      = hInstance;\r
+    wcex.hIcon          = 0;\r
     wcex.hCursor        = LoadCursor(0, IDC_ARROW);\r
-    wcex.hbrBackground    = (HBRUSH)(COLOR_WINDOW+1);\r
-    wcex.lpszMenuName    = 0;\r
-    wcex.lpszClassName    = kWebViewWindowClassName;\r
+    wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);\r
+    wcex.lpszMenuName   = 0;\r
+    wcex.lpszClassName  = kWebViewWindowClassName;\r
     wcex.hIconSm        = 0;\r
 \r
     return RegisterClassEx(&wcex);\r
@@ -108,17 +108,21 @@ WebView::WebView(HWND hWnd)
     d->frame = new FrameWin(page, 0);\r
     FrameView *frameView = new FrameView(d->frame);\r
     d->frame->setView(frameView);\r
+\r
+    d->frame->begin();\r
+    d->frame->write("<img src=\"data:image/gif;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAwAAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFzByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSpa/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJlZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uisF81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PHhhx4dbgYKAAA7\" alt=\"Larry\"><div style=\"border: 1px black\">foo</div><ul><li>foo<li>bar<li>baz</ul>");\r
+    d->frame->end();\r
 }\r
 \r
 WebView::~WebView()\r
 {\r
-    \r
+    delete d;\r
 }\r
 \r
-void WebView::drawRect(const RECT& dirtyRect)\r
+void WebView::drawRect(const PAINTSTRUCT& ps)\r
 {\r
-    GraphicsContext context;\r
-    d->frame->paint(&context, dirtyRect);\r
+    GraphicsContext context(ps.hdc);\r
+    d->frame->paint(&context, ps.rcPaint);\r
 }\r
 \r
 HWND WebView::windowHandle()\r
@@ -126,15 +130,6 @@ HWND WebView::windowHandle()
     return d->windowHandle;\r
 }\r
 \r
-//\r
-//  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)\r
-//\r
-//  PURPOSE:  Processes messages for the main window.\r
-//\r
-//  WM_COMMAND    - process the application menu\r
-//  WM_PAINT    - Paint the main window\r
-//  WM_DESTROY    - post a quit message and return\r
-//\r
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)\r
 {\r
     int wmId, wmEvent;\r
@@ -159,7 +154,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         PAINTSTRUCT ps;\r
         hdc = BeginPaint(hWnd, &ps);\r
         // TODO: Add any drawing code here...\r
-        gSharedWebViewHack->drawRect(ps.rcPaint);\r
+        gSharedWebViewHack->drawRect(ps);\r
         EndPaint(hWnd, &ps);\r
         break;\r
     case WM_DESTROY:\r

diff --git a/WebKitTools/Spinneret/Spinneret/WebView.h b/WebKitTools/Spinneret/Spinneret/WebView.h
index b867f2624fbdffdc70e811c5fbde0445e33216e9..8e8735560597e36da5c72d1c43f6922427d5655e 100755 (executable)
--- a/WebKitTools/Spinneret/Spinneret/WebView.h
+++ b/WebKitTools/Spinneret/Spinneret/WebView.h
@@ -34,14 +34,14 @@ namespace WebKit {
 \r
         ~WebView();\r
 \r
-        void drawRect(const RECT&);\r
+        void drawRect(const PAINTSTRUCT&);\r
 \r
         HWND windowHandle();\r
     private:\r
         WebView(HWND);\r
         \r
         class WebViewPrivate;\r
-        WebViewPrivate *d;\r
+        WebViewPrivate* d;\r
     };\r
 }\r
 \r