2006-03-30 Eric Seidel <eseidel@apple.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Mar 2006 22:16:41 +0000 (22:16 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Mar 2006 22:16:41 +0000 (22:16 +0000)
        Reviewed by ggaren.

        Remove WebFrame::viewImpl(), setMainFrame on page.

        * Spinneret/Spinneret/WebFrame.cpp:
        (WebKit::WebFrame::WebFrame):
        * Spinneret/Spinneret/WebFrame.h:
        * Spinneret/Spinneret/WebView.cpp:
        (WebKit::WebView::mouseMoved):
        (WebKit::WebView::mouseDown):
        (WebKit::WebView::mouseUp):
        (WebKit::WebView::mouseDoubleClick):
        (WebKit::WebViewWndProc):

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

WebKitTools/ChangeLog
WebKitTools/Spinneret/Spinneret/WebFrame.cpp
WebKitTools/Spinneret/Spinneret/WebFrame.h
WebKitTools/Spinneret/Spinneret/WebView.cpp

index 5a6e0776c1c528566ff84d469855963690839cf5..cb2483613566c2cdd5d1564655cb564907e8e549 100644 (file)
@@ -1,3 +1,19 @@
+2006-03-30  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by ggaren.
+
+        Remove WebFrame::viewImpl(), setMainFrame on page.
+
+        * Spinneret/Spinneret/WebFrame.cpp:
+        (WebKit::WebFrame::WebFrame):
+        * Spinneret/Spinneret/WebFrame.h:
+        * Spinneret/Spinneret/WebView.cpp:
+        (WebKit::WebView::mouseMoved):
+        (WebKit::WebView::mouseDown):
+        (WebKit::WebView::mouseUp):
+        (WebKit::WebView::mouseDoubleClick):
+        (WebKit::WebViewWndProc):
+
 2006-03-30  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by hyatt.
index b2f93d596029a31724a597acc8e80f27bff10c77..cc41034f744c22ddd9841f3078e966dc634961ee 100755 (executable)
@@ -64,6 +64,7 @@ WebFrame::WebFrame(char* name, WebView* view)
     d->webView = view;
     Page *page = new Page();
     d->frame = new FrameWin(page, 0, this);
+    page->setMainFrame(d->frame);
     d->frameView = new FrameView(d->frame);
     d->frame->setView(d->frameView);
     d->frameView->setWindowHandle(view->windowHandle());
@@ -184,10 +185,5 @@ WebCore::Frame* WebFrame::impl()
     return d->frame;
 }
 
-WebCore::FrameView* WebFrame::viewImpl()
-{
-    return d->frameView;
-}
-
 }
 
index 4945419c8cd1f802e419ef1a3e3b2bae92a5038a..ad4de76a9c274b02f657709c13850853fcb0340a 100755 (executable)
@@ -59,7 +59,6 @@ namespace WebKit {
     void paint();
 
     WebCore::Frame* impl();
-    WebCore::FrameView* viewImpl();
 
     private:
         class WebFramePrivate;
index 902a9ea62a9593613160da96d5504068bbaa0386..b36becc7c250c373ff2d2e355fb20705b374ff7e 100755 (executable)
@@ -129,25 +129,25 @@ WebFrame* WebView::mainFrame()
 void WebView::mouseMoved(WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(windowHandle(), wParam, lParam, 0);
-    d->mainFrame->viewImpl()->handleMouseMoveEvent(mouseEvent);
+    d->mainFrame->impl()->view()->handleMouseMoveEvent(mouseEvent);
 }
 
 void WebView::mouseDown(WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(windowHandle(), wParam, lParam, 1);
-    d->mainFrame->viewImpl()->handleMousePressEvent(mouseEvent);
+    d->mainFrame->impl()->view()->handleMousePressEvent(mouseEvent);
 }
 
 void WebView::mouseUp(WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(windowHandle(), wParam, lParam, 1);
-    d->mainFrame->viewImpl()->handleMouseReleaseEvent(mouseEvent);
+    d->mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
 }
 
 void WebView::mouseDoubleClick(WPARAM wParam, LPARAM lParam)
 {
     PlatformMouseEvent mouseEvent(windowHandle(), wParam, lParam, 2);
-    d->mainFrame->viewImpl()->handleMouseReleaseEvent(mouseEvent);
+    d->mainFrame->impl()->view()->handleMouseReleaseEvent(mouseEvent);
 }
 
 bool WebView::keyPress(WPARAM wParam, LPARAM lParam)
@@ -264,13 +264,13 @@ LRESULT CALLBACK WebViewWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
         webview->mouseDoubleClick(wParam, lParam);
         break;
     case WM_HSCROLL: {
-        ScrollView* view = webview->mainFrame()->viewImpl();
+        ScrollView* view = webview->mainFrame()->impl()->view();
         view->scrollBy(calculateScrollDelta(wParam, view->contentsX(), view->visibleWidth()), 0);
         webview->mainFrame()->impl()->sendScrollEvent();
         break;
     }
     case WM_VSCROLL: {
-        ScrollView* view = webview->mainFrame()->viewImpl();
+        ScrollView* view = webview->mainFrame()->impl()->view();
         view->scrollBy(0, calculateScrollDelta(wParam, view->contentsY(), view->visibleHeight()));
         webview->mainFrame()->impl()->sendScrollEvent();
         break;