| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> | 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> |
| 3 * 1999 Lars Knoll <knoll@kde.org> | 3 * 1999 Lars Knoll <knoll@kde.org> |
| 4 * 1999 Antti Koivisto <koivisto@kde.org> | 4 * 1999 Antti Koivisto <koivisto@kde.org> |
| 5 * 2000 Dirk Mueller <mueller@kde.org> | 5 * 2000 Dirk Mueller <mueller@kde.org> |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) | 7 * (C) 2006 Graham Dennis (graham.dennis@gmail.com) |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2009 Google Inc. All rights reserved. | 9 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 10 * | 10 * |
| (...skipping 1618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1629 Element* htmlElement = frame().document()->documentElement(); | 1629 Element* htmlElement = frame().document()->documentElement(); |
| 1630 | 1630 |
| 1631 // We take the aggregate of the base background color | 1631 // We take the aggregate of the base background color |
| 1632 // the <html> background color, and the <body> | 1632 // the <html> background color, and the <body> |
| 1633 // background color to find the document color. The | 1633 // background color to find the document color. The |
| 1634 // addition of the base background color is not | 1634 // addition of the base background color is not |
| 1635 // technically part of the document background, but it | 1635 // technically part of the document background, but it |
| 1636 // otherwise poses problems when the aggregate is not | 1636 // otherwise poses problems when the aggregate is not |
| 1637 // fully opaque. | 1637 // fully opaque. |
| 1638 if (htmlElement && htmlElement->renderer()) | 1638 if (htmlElement && htmlElement->renderer()) |
| 1639 result = result.blend(htmlElement->renderer()->style()->visitedDependent
Color(CSSPropertyBackgroundColor)); | 1639 result = result.blend(htmlElement->renderer()->style()->colorIncludingFa
llback(CSSPropertyBackgroundColor)); |
| 1640 | 1640 |
| 1641 return result; | 1641 return result; |
| 1642 } | 1642 } |
| 1643 | 1643 |
| 1644 bool FrameView::wasScrolledByUser() const | 1644 bool FrameView::wasScrolledByUser() const |
| 1645 { | 1645 { |
| 1646 return m_wasScrolledByUser; | 1646 return m_wasScrolledByUser; |
| 1647 } | 1647 } |
| 1648 | 1648 |
| 1649 void FrameView::setWasScrolledByUser(bool wasScrolledByUser) | 1649 void FrameView::setWasScrolledByUser(bool wasScrolledByUser) |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2017 void FrameView::setLayoutSizeInternal(const IntSize& size) | 2017 void FrameView::setLayoutSizeInternal(const IntSize& size) |
| 2018 { | 2018 { |
| 2019 if (m_layoutSize == size) | 2019 if (m_layoutSize == size) |
| 2020 return; | 2020 return; |
| 2021 | 2021 |
| 2022 m_layoutSize = size; | 2022 m_layoutSize = size; |
| 2023 contentsResized(); | 2023 contentsResized(); |
| 2024 } | 2024 } |
| 2025 | 2025 |
| 2026 } // namespace blink | 2026 } // namespace blink |
| OLD | NEW |