Merge 141019

Source/WebKit/chromium/src/WebViewImpl.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 578 matching lines @@
     bool hasVerticalScrollbar();
 
     // Pointer Lock calls allow a page to capture all mouse events and
     // disable the system cursor.
 #if ENABLE(POINTER_LOCK)
     virtual bool requestPointerLock();
     virtual void requestPointerUnlock();
     virtual bool isPointerLocked();
 #endif
 
+    // Heuristic-based function for determining if we should disable workarounds
+    // for viewing websites that are not optimized for mobile devices.
+    bool shouldDisableDesktopWorkarounds();
+
 #if ENABLE(GESTURE_EVENTS)
     // Exposed for tests.
     LinkHighlight* linkHighlight() { return m_linkHighlight.get(); }
 #endif
 
     WebSettingsImpl* settingsImpl();
 
 private:
     bool computePageScaleFactorLimits();
     float clampPageScaleFactorToLimits(float scale);
@@ skipping 275 matching lines @@
 
     bool m_suppressInvalidations;
 
     bool m_showFPSCounter;
     bool m_showPaintRects;
 };
 
 } // namespace WebKit
 
 #endif