WebCore:

        Reviewed by Darin Adler.

        - fix <rdar://problem/5134044> fast/frames/frame-src-attribute.html fails on Windows

        * platform/win/ScrollViewWin.cpp:
        (WebCore::ScrollView::visibleWidth): Do not return negative values.
        (WebCore::ScrollView::visibleHeight): Ditto.

LayoutTests:

        Reviewed by Darin Adler.

        - remove passing test

        * platform/win/Skipped:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c430817cbeec87ba3a8368f4fca00d994278fa39..b840fb6664dc195199d3b01280ffd72be86bde68 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - remove passing test
+
+        * platform/win/Skipped:
+
 2007-12-03  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index 2c09be8cfefc5b845c74fab4dd6026e60bc1e437..93bbf6cef3c946ba9c50965f8a95869ccb11a11c 100644 (file)
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -314,9 +314,6 @@ fast/events/frame-tab-focus.html
 fast/events/option-tab.html
 fast/forms/focus2.html
 
-# fast/frames/frame-src-attribute.html fails on boomer <rdar://problem/5134044>
-fast/frames/frame-src-attribute.html
-
 # fast/html/keygen.html is failing on boomer <rdar://problem/5133799>
 fast/html/keygen.html
 fast/invalid/residual-style.html

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e91e18f83c1b56538b315df5b66f19038387ef06..bf9d66ae265c3a578b6e3321cac248272b0f5611 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-12-03  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix <rdar://problem/5134044> fast/frames/frame-src-attribute.html fails on Windows
+
+        * platform/win/ScrollViewWin.cpp:
+        (WebCore::ScrollView::visibleWidth): Do not return negative values.
+        (WebCore::ScrollView::visibleHeight): Ditto.
+
 2007-12-03  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/WebCore/platform/win/ScrollViewWin.cpp b/WebCore/platform/win/ScrollViewWin.cpp
index 465f5b860e5fe7befe7ee10cb6e70ef5a741b71f..4569c63800bf2ec6897de112de46de46b5bfeb25 100644 (file)
--- a/WebCore/platform/win/ScrollViewWin.cpp
+++ b/WebCore/platform/win/ScrollViewWin.cpp
@@ -237,12 +237,12 @@ void ScrollView::update()
 
 int ScrollView::visibleWidth() const
 {
-    return width() - (m_data->m_vBar ? m_data->m_vBar->width() : 0);
+    return max(0, width() - (m_data->m_vBar ? m_data->m_vBar->width() : 0));
 }
 
 int ScrollView::visibleHeight() const
 {
-    return height() - (m_data->m_hBar ? m_data->m_hBar->height() : 0);
+    return max(0, height() - (m_data->m_hBar ? m_data->m_hBar->height() : 0));
 }
 
 FloatRect ScrollView::visibleContentRect() const