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 3084 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3095 if (scrollbar->isCustomScrollbar()) | 3095 if (scrollbar->isCustomScrollbar()) |
3096 return true; | 3096 return true; |
3097 } | 3097 } |
3098 } | 3098 } |
3099 | 3099 |
3100 return false; | 3100 return false; |
3101 } | 3101 } |
3102 | 3102 |
3103 FrameView* FrameView::parentFrameView() const | 3103 FrameView* FrameView::parentFrameView() const |
3104 { | 3104 { |
| 3105 if (!parent()) |
| 3106 return 0; |
| 3107 |
3105 if (Frame* parentFrame = m_frame->tree()->parent()) | 3108 if (Frame* parentFrame = m_frame->tree()->parent()) |
3106 return parentFrame->view(); | 3109 return parentFrame->view(); |
3107 | 3110 |
3108 return 0; | 3111 return 0; |
3109 } | 3112 } |
3110 | 3113 |
3111 bool FrameView::isInChildFrameWithFrameFlattening() const | 3114 bool FrameView::isInChildFrameWithFrameFlattening() const |
3112 { | 3115 { |
3113 if (!parent() || !m_frame->ownerElement()) | 3116 if (!parent() || !m_frame->ownerElement()) |
3114 return false; | 3117 return false; |
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3809 { | 3812 { |
3810 #if USE(ACCELERATED_COMPOSITING) | 3813 #if USE(ACCELERATED_COMPOSITING) |
3811 if (TiledBacking* tiledBacking = this->tiledBacking()) | 3814 if (TiledBacking* tiledBacking = this->tiledBacking()) |
3812 tiledBacking->setScrollingPerformanceLoggingEnabled(flag); | 3815 tiledBacking->setScrollingPerformanceLoggingEnabled(flag); |
3813 #else | 3816 #else |
3814 UNUSED_PARAM(flag); | 3817 UNUSED_PARAM(flag); |
3815 #endif | 3818 #endif |
3816 } | 3819 } |
3817 | 3820 |
3818 } // namespace WebCore | 3821 } // namespace WebCore |
OLD | NEW |