Ignore viewport meta tags when Request Desktop Site is enabled.

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@gmail.com>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 1433 matching lines @@
 
 bool PaintLayerScrollableArea::visualViewportSuppliesScrollbars() const
 {
     if (!layer()->isRootLayer())
         return false;
 
     LocalFrame* frame = box().frame();
     if (!frame || !frame->isMainFrame() || !frame->settings())
         return false;
 
-    return frame->settings()->viewportMetaEnabled();
+    return frame->settings()->viewportEnabled();
 }
 
 Widget* PaintLayerScrollableArea::getWidget()
 {
     return box().frame()->view();
 }
 
 void PaintLayerScrollableArea::resetRebuildScrollbarLayerFlags()
 {
     m_rebuildHorizontalScrollbarLayer = false;
@@ skipping 119 matching lines @@
 }
 
 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
 {
     visitor->trace(m_scrollableArea);
     visitor->trace(m_hBar);
     visitor->trace(m_vBar);
 }
 
 } // namespace blink