| Index: third_party/WebKit/Source/core/frame/History.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/History.cpp b/third_party/WebKit/Source/core/frame/History.cpp
|
| index 0b9503f6a518b1944228ed029660b16b554658ff..313a4f0c10553f59e67748392f1fc82448c1402f 100644
|
| --- a/third_party/WebKit/Source/core/frame/History.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/History.cpp
|
| @@ -93,7 +93,7 @@ SerializedScriptValue* History::stateInternal() const
|
| void History::setScrollRestoration(const String& value)
|
| {
|
| ASSERT(value == "manual" || value == "auto");
|
| - if (!m_frame || !m_frame->loader().client() || !RuntimeEnabledFeatures::scrollRestorationEnabled())
|
| + if (!m_frame || !m_frame->loader().client())
|
| return;
|
|
|
| HistoryScrollRestorationType scrollRestoration = value == "manual" ? ScrollRestorationManual : ScrollRestorationAuto;
|
| @@ -113,7 +113,7 @@ String History::scrollRestoration()
|
|
|
| HistoryScrollRestorationType History::scrollRestorationInternal() const
|
| {
|
| - if (m_frame && RuntimeEnabledFeatures::scrollRestorationEnabled()) {
|
| + if (m_frame) {
|
| if (HistoryItem* historyItem = m_frame->loader().currentItem())
|
| return historyItem->scrollRestorationType();
|
| }
|
|
|