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 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1435 if (mode == m_displayMode) | 1435 if (mode == m_displayMode) |
1436 return; | 1436 return; |
1437 | 1437 |
1438 m_displayMode = mode; | 1438 m_displayMode = mode; |
1439 | 1439 |
1440 if (m_frame->document()) | 1440 if (m_frame->document()) |
1441 m_frame->document()->mediaQueryAffectingValueChanged(); | 1441 m_frame->document()->mediaQueryAffectingValueChanged(); |
1442 } | 1442 } |
1443 | 1443 |
1444 void FrameView::setMediaType(const AtomicString& mediaType) { | 1444 void FrameView::setMediaType(const AtomicString& mediaType) { |
1445 ASSERT(m_frame->document()); | 1445 DCHECK(m_frame->document()); |
| 1446 m_mediaType = mediaType; |
1446 m_frame->document()->mediaQueryAffectingValueChanged(); | 1447 m_frame->document()->mediaQueryAffectingValueChanged(); |
1447 m_mediaType = mediaType; | |
1448 } | 1448 } |
1449 | 1449 |
1450 AtomicString FrameView::mediaType() const { | 1450 AtomicString FrameView::mediaType() const { |
1451 // See if we have an override type. | 1451 // See if we have an override type. |
1452 if (m_frame->settings() && | 1452 if (m_frame->settings() && |
1453 !m_frame->settings()->mediaTypeOverride().isEmpty()) | 1453 !m_frame->settings()->mediaTypeOverride().isEmpty()) |
1454 return AtomicString(m_frame->settings()->mediaTypeOverride()); | 1454 return AtomicString(m_frame->settings()->mediaTypeOverride()); |
1455 return m_mediaType; | 1455 return m_mediaType; |
1456 } | 1456 } |
1457 | 1457 |
(...skipping 3189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4647 DCHECK(m_frame->isMainFrame()); | 4647 DCHECK(m_frame->isMainFrame()); |
4648 return m_initialViewportSize.width(); | 4648 return m_initialViewportSize.width(); |
4649 } | 4649 } |
4650 | 4650 |
4651 int FrameView::initialViewportHeight() const { | 4651 int FrameView::initialViewportHeight() const { |
4652 DCHECK(m_frame->isMainFrame()); | 4652 DCHECK(m_frame->isMainFrame()); |
4653 return m_initialViewportSize.height(); | 4653 return m_initialViewportSize.height(); |
4654 } | 4654 } |
4655 | 4655 |
4656 } // namespace blink | 4656 } // namespace blink |
OLD | NEW |