| 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 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1211 ASSERT(node); | 1211 ASSERT(node); |
| 1212 if (isHTMLObjectElement(*node) || isHTMLEmbedElement(*node)) | 1212 if (isHTMLObjectElement(*node) || isHTMLEmbedElement(*node)) |
| 1213 toHTMLPlugInElement(node)->setNeedsWidgetUpdate(true); | 1213 toHTMLPlugInElement(node)->setNeedsWidgetUpdate(true); |
| 1214 | 1214 |
| 1215 m_partUpdateSet.add(&object); | 1215 m_partUpdateSet.add(&object); |
| 1216 } | 1216 } |
| 1217 | 1217 |
| 1218 void FrameView::setDisplayMode(WebDisplayMode mode) | 1218 void FrameView::setDisplayMode(WebDisplayMode mode) |
| 1219 { | 1219 { |
| 1220 m_displayMode = mode; | 1220 m_displayMode = mode; |
| 1221 m_frame->document()->mediaQueryAffectingValueChanged(); | 1221 if (m_frame->document()) |
| 1222 m_frame->document()->mediaQueryAffectingValueChanged(); |
| 1222 } | 1223 } |
| 1223 | 1224 |
| 1224 void FrameView::setMediaType(const AtomicString& mediaType) | 1225 void FrameView::setMediaType(const AtomicString& mediaType) |
| 1225 { | 1226 { |
| 1226 ASSERT(m_frame->document()); | 1227 ASSERT(m_frame->document()); |
| 1227 m_frame->document()->mediaQueryAffectingValueChanged(); | 1228 m_frame->document()->mediaQueryAffectingValueChanged(); |
| 1228 m_mediaType = mediaType; | 1229 m_mediaType = mediaType; |
| 1229 } | 1230 } |
| 1230 | 1231 |
| 1231 AtomicString FrameView::mediaType() const | 1232 AtomicString FrameView::mediaType() const |
| (...skipping 2828 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4060 { | 4061 { |
| 4061 Settings* settings = frame().settings(); | 4062 Settings* settings = frame().settings(); |
| 4062 if (!settings || !settings->rootLayerScrolls()) | 4063 if (!settings || !settings->rootLayerScrolls()) |
| 4063 return this; | 4064 return this; |
| 4064 | 4065 |
| 4065 LayoutView* layoutView = this->layoutView(); | 4066 LayoutView* layoutView = this->layoutView(); |
| 4066 return layoutView ? layoutView->scrollableArea() : nullptr; | 4067 return layoutView ? layoutView->scrollableArea() : nullptr; |
| 4067 } | 4068 } |
| 4068 | 4069 |
| 4069 } // namespace blink | 4070 } // namespace blink |
| OLD | NEW |