Changeset 37667 in webkit

Timestamp:

Oct 17, 2008 5:03:58 PM (16 years ago)

Author:

kevino@webkit.org

Message:

Reviewed by Kevin Ollivier

Fix wx port's scrollbar and drawing handling after recent changes.

​https://bugs.webkit.org/show_bug.cgi?id=21720

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/ScrollView.h (modified) (1 diff)
• WebCore/platform/wx/ScrollViewWx.cpp (modified) (4 diffs)
• WebCore/platform/wx/WidgetWx.cpp (modified) (1 diff)
• WebKit/wx/ChangeLog (modified) (1 diff)
• WebKit/wx/WebView.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-10-17  Kevin Watters  <kevinwatters@gmail.com>
+
+        Reviewed by Kevin Ollivier
+        
+        Fix wx port's scrollbar and drawing handling after recent changes.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=21720
+
+        * platform/ScrollView.h:
+        * platform/wx/ScrollViewWx.cpp:
+        (WebCore::ScrollView::platformVisibleContentRect):
+        (WebCore::ScrollView::platformContentsSize):
+        (WebCore::ScrollView::platformSetContentsSize):
+        * platform/wx/WidgetWx.cpp:
+        (WebCore::Widget::paint):
+
 2008-10-17  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebCore/platform/ScrollView.h

@@ -297 +297 @@
 public:
     virtual void setPlatformWidget(wxWindow*);
-
+    void adjustScrollbars(int x = -1, int y = -1, bool refresh = true);
 private:
-    void adjustScrollbars(int x = -1, int y = -1, bool refresh = true);
     class ScrollViewPrivate;
     ScrollViewPrivate* m_data;

trunk/WebCore/platform/wx/ScrollViewWx.cpp

@@ -152 +152 @@
 IntRect ScrollView::platformVisibleContentRect(bool includeScrollbars) const
 {
-    // FIXME: Need to support includeScrollbars option.
-    int width;
-    platformWidget()->GetClientSize(NULL, &width);
-    int height;
-    platformWidget()->GetClientSize(NULL, &height);
-    ASSERT(width >= 0 && height >= 0);
+    wxWindow* win = platformWidget();
+    if (!win)
+        return IntRect();
+
+    int width, height;
+
+    if (includeScrollbars)
+        win->GetSize(&width, &height);
+    else
+        win->GetClientSize(&width, &height);
+        
     return IntRect(m_data->viewStart.x, m_data->viewStart.y, width, height);
 }
@@ -165 +170 @@
     int width = 0;
     int height = 0;
-    platformWidget()->GetVirtualSize(&width, NULL);
-    platformWidget()->GetVirtualSize(&height, NULL);
-    ASSERT(width >= 0 && height >= 0);
+    if (platformWidget()) {
+        platformWidget()->GetVirtualSize(&width, &height);
+        ASSERT(width >= 0 && height >= 0);
+    }
     return IntSize(width, height);
 }
@@ -220 +226 @@
         return;
 
-    win->SetVirtualSize(contentsWidth(), contentsHeight());
+    win->SetVirtualSize(m_contentsSize.width(), m_contentsSize.height());
     adjustScrollbars();
 }
@@ -344 +350 @@
 }
 
-
-}
+}

trunk/WebCore/platform/wx/WidgetWx.cpp

@@ -90 +90 @@
 void Widget::paint(GraphicsContext*,const IntRect& r)
 {
-    invalidateRect(r);
-    if (platformWidget())
-        platformWidget()->Update();
 }
 

trunk/WebKit/wx/ChangeLog

@@ +1 @@
+2008-10-17  Kevin Watters  <kevinwatters@gmail.com>
+        
+        Reviewed by Kevin Ollivier
+
+        Fix wx port's scrollbar and drawing handling after recent changes.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=21720
+
+        * WebView.cpp:
+        (wxWebView::OnPaint):
+        (wxWebView::OnSize):
+
 2008-10-09  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/WebKit/wx/WebView.cpp

@@ -433 +433 @@
                     frame->view()->layout();
 
-                frame->view()->paint(gc, paintRect);
+                frame->view()->paintContents(gc, paintRect);
             }
             delete gc;
@@ -446 +446 @@
         frame->sendResizeEvent();
         frame->view()->layout();
+        frame->view()->adjustScrollbars();
     }