| Index: Source/core/testing/InternalSettings.h
|
| diff --git a/Source/core/testing/InternalSettings.h b/Source/core/testing/InternalSettings.h
|
| index 7dfe7e7bb649032cdb3afe6c9d0b82c229c973d4..9a43cf4f14bbb6ff68484149707b92661c109d66 100644
|
| --- a/Source/core/testing/InternalSettings.h
|
| +++ b/Source/core/testing/InternalSettings.h
|
| @@ -59,7 +59,7 @@ public:
|
| float m_originalTextAutosizingFontScaleFactor;
|
| String m_originalMediaTypeOverride;
|
| bool m_originalMockScrollbarsEnabled;
|
| - bool m_originalUsesOverlayScrollbars;
|
| + bool m_originalMockScrollbarsUseOverlay;
|
| bool m_langAttributeAwareFormControlUIEnabled;
|
| bool m_imagesEnabled;
|
| bool m_shouldDisplaySubtitles;
|
| @@ -92,11 +92,11 @@ public:
|
| void setImagesEnabled(bool, ExceptionState&);
|
| void setMediaTypeOverride(const String& mediaType, ExceptionState&);
|
| void setMockScrollbarsEnabled(bool, ExceptionState&);
|
| + void setMockScrollbarsUseOverlay(bool, ExceptionState&);
|
| void setTextAutosizingEnabled(bool, ExceptionState&);
|
| void setTextAutosizingFontScaleFactor(float fontScaleFactor, ExceptionState&);
|
| void setTextAutosizingWindowSizeOverride(int width, int height, ExceptionState&);
|
| void setTouchEventEmulationEnabled(bool, ExceptionState&);
|
| - void setUsesOverlayScrollbars(bool, ExceptionState&);
|
| void setViewportEnabled(bool, ExceptionState&);
|
|
|
| // FIXME: This is a temporary flag and should be removed once accelerated
|
|
|