| 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) 2000 Dirk Mueller (mueller@kde.org) | 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) |
| 4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2004, 2006, 2009, 2010 Apple Inc. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 } | 214 } |
| 215 | 215 |
| 216 void RenderWidget::layout() | 216 void RenderWidget::layout() |
| 217 { | 217 { |
| 218 StackStats::LayoutCheckPoint layoutCheckPoint; | 218 StackStats::LayoutCheckPoint layoutCheckPoint; |
| 219 ASSERT(needsLayout()); | 219 ASSERT(needsLayout()); |
| 220 | 220 |
| 221 setNeedsLayout(false); | 221 setNeedsLayout(false); |
| 222 } | 222 } |
| 223 | 223 |
| 224 void RenderWidget::styleDidChange(StyleDifference diff, const RenderStyle* oldSt
yle) | 224 void RenderWidget::styleDidChange(StyleDifference diff, const RenderStyle* oldSt
yle, const StyleChangeState& state) |
| 225 { | 225 { |
| 226 RenderReplaced::styleDidChange(diff, oldStyle); | 226 RenderReplaced::styleDidChange(diff, oldStyle, state); |
| 227 if (m_widget) { | 227 if (m_widget) { |
| 228 if (style()->visibility() != VISIBLE) | 228 if (style()->visibility() != VISIBLE) |
| 229 m_widget->hide(); | 229 m_widget->hide(); |
| 230 else | 230 else |
| 231 m_widget->show(); | 231 m_widget->show(); |
| 232 } | 232 } |
| 233 } | 233 } |
| 234 | 234 |
| 235 void RenderWidget::notifyWidget(WidgetNotification notification) | 235 void RenderWidget::notifyWidget(WidgetNotification notification) |
| 236 { | 236 { |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor
) const | 404 CursorDirective RenderWidget::getCursor(const LayoutPoint& point, Cursor& cursor
) const |
| 405 { | 405 { |
| 406 if (widget() && widget()->isPluginViewBase()) { | 406 if (widget() && widget()->isPluginViewBase()) { |
| 407 // A plug-in is responsible for setting the cursor when the pointer is o
ver it. | 407 // A plug-in is responsible for setting the cursor when the pointer is o
ver it. |
| 408 return DoNotSetCursor; | 408 return DoNotSetCursor; |
| 409 } | 409 } |
| 410 return RenderReplaced::getCursor(point, cursor); | 410 return RenderReplaced::getCursor(point, cursor); |
| 411 } | 411 } |
| 412 | 412 |
| 413 } // namespace WebCore | 413 } // namespace WebCore |
| OLD | NEW |