| Index: Source/core/page/Settings.h
|
| diff --git a/Source/core/page/Settings.h b/Source/core/page/Settings.h
|
| index 859439e09cd5dca6fbdd9861e2dd0b755e5e10fe..59a2addbdc9b836c54e2ea57ed22408c22400d65 100644
|
| --- a/Source/core/page/Settings.h
|
| +++ b/Source/core/page/Settings.h
|
| @@ -165,6 +165,11 @@ public:
|
| void setCompositorDrivenAcceleratedScrollingEnabled(bool enabled) { m_compositorDrivenAcceleratedScrollingEnabled = enabled; }
|
| bool isCompositorDrivenAcceleratedScrollingEnabled() const { return m_compositorDrivenAcceleratedScrollingEnabled; }
|
|
|
| + // FIXME: This is a temporary flag and should be removed when squashing is ready.
|
| + // (crbug.com/261605)
|
| + void setLayerSquashingEnabled(bool enabled) { m_layerSquashingEnabled = enabled; }
|
| + bool isLayerSquashingEnabled() const { return m_layerSquashingEnabled; }
|
| +
|
| private:
|
| explicit Settings(Page*);
|
|
|
| @@ -203,6 +208,9 @@ private:
|
| // overflow scroll is ready (crbug.com/254111).
|
| bool m_compositorDrivenAcceleratedScrollingEnabled : 1;
|
|
|
| + // FIXME: This is a temporary flag and should be removed when squashing is ready.
|
| + bool m_layerSquashingEnabled : 1;
|
| +
|
| Timer<Settings> m_setImageLoadingSettingsTimer;
|
| void imageLoadingSettingsTimerFired(Timer<Settings>*);
|
| void recalculateTextAutosizingMultipliers();
|
|
|