| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 494 // If we have a pending scroll, invalidate the previous scroll position. | 494 // If we have a pending scroll, invalidate the previous scroll position. |
| 495 if (!m_frameView->pendingScrollDelta().isZero()) { | 495 if (!m_frameView->pendingScrollDelta().isZero()) { |
| 496 rect.move(-m_frameView->pendingScrollDelta()); | 496 rect.move(-m_frameView->pendingScrollDelta()); |
| 497 } | 497 } |
| 498 } | 498 } |
| 499 | 499 |
| 500 // Apply our transform if we have one (because of full page zooming). | 500 // Apply our transform if we have one (because of full page zooming). |
| 501 if (!paintInvalidationContainer && layer() && layer()->transform()) | 501 if (!paintInvalidationContainer && layer() && layer()->transform()) |
| 502 rect = layer()->transform()->mapRect(rect); | 502 rect = layer()->transform()->mapRect(rect); |
| 503 | 503 |
| 504 ASSERT(paintInvalidationContainer); | |
| 505 if (paintInvalidationContainer == this) | 504 if (paintInvalidationContainer == this) |
| 506 return; | 505 return; |
| 507 | 506 |
| 508 Element* owner = document().ownerElement(); | 507 Element* owner = document().ownerElement(); |
| 509 if (!owner) | 508 if (!owner) |
| 510 return; | 509 return; |
| 511 | 510 |
| 512 if (RenderBox* obj = owner->renderBox()) { | 511 if (RenderBox* obj = owner->renderBox()) { |
| 513 // Intersect the viewport with the paint invalidation rect. | 512 // Intersect the viewport with the paint invalidation rect. |
| 514 LayoutRect viewRectangle = viewRect(); | 513 LayoutRect viewRectangle = viewRect(); |
| (...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 991 return viewWidth(IncludeScrollbars) / scale; | 990 return viewWidth(IncludeScrollbars) / scale; |
| 992 } | 991 } |
| 993 | 992 |
| 994 double RenderView::layoutViewportHeight() const | 993 double RenderView::layoutViewportHeight() const |
| 995 { | 994 { |
| 996 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; | 995 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; |
| 997 return viewHeight(IncludeScrollbars) / scale; | 996 return viewHeight(IncludeScrollbars) / scale; |
| 998 } | 997 } |
| 999 | 998 |
| 1000 } // namespace blink | 999 } // namespace blink |
| OLD | NEW |