Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 1785953002: Ignore viewport meta tags when Request Desktop Site is enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change loop style Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2976 matching lines...) Expand 10 before | Expand all | Expand 10 after
2987 2987
2988 if (child->isFrameView()) 2988 if (child->isFrameView())
2989 removeScrollableArea(toFrameView(child)); 2989 removeScrollableArea(toFrameView(child));
2990 2990
2991 child->setParent(0); 2991 child->setParent(0);
2992 m_children.remove(child); 2992 m_children.remove(child);
2993 } 2993 }
2994 2994
2995 bool FrameView::visualViewportSuppliesScrollbars() const 2995 bool FrameView::visualViewportSuppliesScrollbars() const
2996 { 2996 {
2997 return m_frame->isMainFrame() && m_frame->settings() && m_frame->settings()- >viewportMetaEnabled(); 2997 return m_frame->isMainFrame() && m_frame->settings() && m_frame->settings()- >viewportEnabled();
2998 } 2998 }
2999 2999
3000 AXObjectCache* FrameView::axObjectCache() const 3000 AXObjectCache* FrameView::axObjectCache() const
3001 { 3001 {
3002 if (frame().document()) 3002 if (frame().document())
3003 return frame().document()->existingAXObjectCache(); 3003 return frame().document()->existingAXObjectCache();
3004 return nullptr; 3004 return nullptr;
3005 } 3005 }
3006 3006
3007 void FrameView::setCursor(const Cursor& cursor) 3007 void FrameView::setCursor(const Cursor& cursor)
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
4098 return m_hiddenForThrottling && m_crossOriginForThrottling; 4098 return m_hiddenForThrottling && m_crossOriginForThrottling;
4099 } 4099 }
4100 4100
4101 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4101 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4102 { 4102 {
4103 ASSERT(layoutView()); 4103 ASSERT(layoutView());
4104 return *layoutView(); 4104 return *layoutView();
4105 } 4105 }
4106 4106
4107 } // namespace blink 4107 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.cpp ('k') | third_party/WebKit/Source/core/frame/VisualViewport.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698