| OLD | NEW | 
|    1 /* |    1 /* | 
|    2  * Copyright (C) 2009 Google Inc. All rights reserved. |    2  * Copyright (C) 2009 Google Inc. All rights reserved. | 
|    3  * |    3  * | 
|    4  * Redistribution and use in source and binary forms, with or without |    4  * Redistribution and use in source and binary forms, with or without | 
|    5  * modification, are permitted provided that the following conditions are |    5  * modification, are permitted provided that the following conditions are | 
|    6  * met: |    6  * met: | 
|    7  * |    7  * | 
|    8  *     * Redistributions of source code must retain the above copyright |    8  *     * Redistributions of source code must retain the above copyright | 
|    9  * notice, this list of conditions and the following disclaimer. |    9  * notice, this list of conditions and the following disclaimer. | 
|   10  *     * Redistributions in binary form must reproduce the above |   10  *     * Redistributions in binary form must reproduce the above | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|   40  |   40  | 
|   41 namespace blink { |   41 namespace blink { | 
|   42  |   42  | 
|   43 class WebSettingsImpl FINAL : public WebSettings { |   43 class WebSettingsImpl FINAL : public WebSettings { | 
|   44 public: |   44 public: | 
|   45     explicit WebSettingsImpl(blink::Settings*, blink::InspectorController*); |   45     explicit WebSettingsImpl(blink::Settings*, blink::InspectorController*); | 
|   46     virtual ~WebSettingsImpl() { } |   46     virtual ~WebSettingsImpl() { } | 
|   47  |   47  | 
|   48     virtual bool mainFrameResizesAreOrientationChanges() const OVERRIDE; |   48     virtual bool mainFrameResizesAreOrientationChanges() const OVERRIDE; | 
|   49     virtual bool shrinksViewportContentToFit() const OVERRIDE; |   49     virtual bool shrinksViewportContentToFit() const OVERRIDE; | 
|   50     virtual bool scrollAnimatorEnabled() const OVERRIDE; |  | 
|   51     virtual bool touchEditingEnabled() const OVERRIDE; |  | 
|   52     virtual bool viewportEnabled() const OVERRIDE; |   50     virtual bool viewportEnabled() const OVERRIDE; | 
|   53     virtual bool viewportMetaEnabled() const OVERRIDE; |  | 
|   54     virtual void setAccelerated2dCanvasEnabled(bool) OVERRIDE; |   51     virtual void setAccelerated2dCanvasEnabled(bool) OVERRIDE; | 
|   55     virtual void setAccelerated2dCanvasMSAASampleCount(int) OVERRIDE; |   52     virtual void setAccelerated2dCanvasMSAASampleCount(int) OVERRIDE; | 
|   56     virtual void setAcceleratedCompositingEnabled(bool) OVERRIDE; |   53     virtual void setAcceleratedCompositingEnabled(bool) OVERRIDE; | 
|   57     virtual void setAcceleratedCompositingForCanvasEnabled(bool) OVERRIDE; |   54     virtual void setAcceleratedCompositingForCanvasEnabled(bool) OVERRIDE; | 
|   58     virtual void setAcceleratedCompositingForFiltersEnabled(bool) OVERRIDE; |   55     virtual void setAcceleratedCompositingForFiltersEnabled(bool) OVERRIDE; | 
|   59     virtual void setAcceleratedCompositingForFixedPositionEnabled(bool) OVERRIDE
     ; |   56     virtual void setAcceleratedCompositingForFixedPositionEnabled(bool) OVERRIDE
     ; | 
|   60     virtual void setAcceleratedCompositingForOverflowScrollEnabled(bool) OVERRID
     E; |   57     virtual void setAcceleratedCompositingForOverflowScrollEnabled(bool) OVERRID
     E; | 
|   61     virtual void setCompositorDrivenAcceleratedScrollingEnabled(bool) OVERRIDE; |   58     virtual void setCompositorDrivenAcceleratedScrollingEnabled(bool) OVERRIDE; | 
|   62     virtual void setAcceleratedCompositingForFixedRootBackgroundEnabled(bool) OV
     ERRIDE; |   59     virtual void setAcceleratedCompositingForFixedRootBackgroundEnabled(bool) OV
     ERRIDE; | 
|   63     virtual void setAcceleratedCompositingForVideoEnabled(bool) OVERRIDE; |   60     virtual void setAcceleratedCompositingForVideoEnabled(bool) OVERRIDE; | 
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  211     // the Android SDK prior to and including version 18. Presumably, this |  208     // the Android SDK prior to and including version 18. Presumably, this | 
|  212     // can be removed any time after 2015. See http://crbug.com/313754. |  209     // can be removed any time after 2015. See http://crbug.com/313754. | 
|  213     bool m_clobberUserAgentInitialScaleQuirk; |  210     bool m_clobberUserAgentInitialScaleQuirk; | 
|  214     bool m_mainFrameResizesAreOrientationChanges; |  211     bool m_mainFrameResizesAreOrientationChanges; | 
|  215     bool m_disallowFullscreenForNonMediaElements; |  212     bool m_disallowFullscreenForNonMediaElements; | 
|  216 }; |  213 }; | 
|  217  |  214  | 
|  218 } // namespace blink |  215 } // namespace blink | 
|  219  |  216  | 
|  220 #endif |  217 #endif | 
| OLD | NEW |