From: mitz@apple.com Date: Tue, 4 Dec 2007 00:28:02 +0000 (+0000) Subject: WebCore: X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=95f2455403647bc4097d0c9e4fd427a1530a0cbd WebCore: Reviewed by Darin Adler. - fix 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 c430817cbeec..b840fb6664dc 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,11 @@ +2007-12-03 Dan Bernstein + + Reviewed by Darin Adler. + + - remove passing test + + * platform/win/Skipped: + 2007-12-03 Dan Bernstein Reviewed by Dave Hyatt. diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped index 2c09be8cfefc..93bbf6cef3c9 100644 --- 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 -fast/frames/frame-src-attribute.html - # fast/html/keygen.html is failing on boomer fast/html/keygen.html fast/invalid/residual-style.html diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index e91e18f83c1b..bf9d66ae265c 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2007-12-03 Dan Bernstein + + Reviewed by Darin Adler. + + - fix 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 Reviewed by Dave Hyatt. diff --git a/WebCore/platform/win/ScrollViewWin.cpp b/WebCore/platform/win/ScrollViewWin.cpp index 465f5b860e5f..4569c63800bf 100644 --- 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