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

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: Call delegate() directly from NavigationControllerAndroid 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 2977 matching lines...) Expand 10 before | Expand all | Expand 10 after
2988 2988
2989 if (child->isFrameView()) 2989 if (child->isFrameView())
2990 removeScrollableArea(toFrameView(child)); 2990 removeScrollableArea(toFrameView(child));
2991 2991
2992 child->setParent(0); 2992 child->setParent(0);
2993 m_children.remove(child); 2993 m_children.remove(child);
2994 } 2994 }
2995 2995
2996 bool FrameView::visualViewportSuppliesScrollbars() const 2996 bool FrameView::visualViewportSuppliesScrollbars() const
2997 { 2997 {
2998 return m_frame->isMainFrame() && m_frame->settings() && m_frame->settings()- >viewportMetaEnabled(); 2998 return m_frame->isMainFrame() && m_frame->settings() && m_frame->settings()- >viewportEnabled();
2999 } 2999 }
3000 3000
3001 AXObjectCache* FrameView::axObjectCache() const 3001 AXObjectCache* FrameView::axObjectCache() const
3002 { 3002 {
3003 if (frame().document()) 3003 if (frame().document())
3004 return frame().document()->existingAXObjectCache(); 3004 return frame().document()->existingAXObjectCache();
3005 return nullptr; 3005 return nullptr;
3006 } 3006 }
3007 3007
3008 void FrameView::setCursor(const Cursor& cursor) 3008 void FrameView::setCursor(const Cursor& cursor)
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
4091 return m_hiddenForThrottling && m_crossOriginForThrottling; 4091 return m_hiddenForThrottling && m_crossOriginForThrottling;
4092 } 4092 }
4093 4093
4094 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const 4094 LayoutBox& FrameView::boxForScrollControlPaintInvalidation() const
4095 { 4095 {
4096 ASSERT(layoutView()); 4096 ASSERT(layoutView());
4097 return *layoutView(); 4097 return *layoutView();
4098 } 4098 }
4099 4099
4100 } // namespace blink 4100 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698