Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (198931 => 198932)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
@@ -1,5 +1,19 @@
2016-03-31 Saam barati <sbar...@apple.com>
+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * parser/Parser.h:
+ (JSC::Parser::next):
+ (JSC::Parser::nextExpectIdentifier):
+ * runtime/VM.h:
+ (JSC::VM::setShouldRewriteConstAsVar): Deleted.
+ (JSC::VM::shouldRewriteConstAsVar): Deleted.
+
+2016-03-31 Saam barati <sbar...@apple.com>
+
[ES6] Disallow var assignments in for-in loops
https://bugs.webkit.org/show_bug.cgi?id=155451
Modified: trunk/Source/_javascript_Core/parser/Parser.h (198931 => 198932)
--- trunk/Source/_javascript_Core/parser/Parser.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/_javascript_Core/parser/Parser.h 2016-04-01 00:24:18 UTC (rev 198932)
@@ -1143,8 +1143,6 @@
m_lastTokenEndPosition = JSTextPosition(lastLine, lastTokenEnd, lastTokenLineStart);
m_lexer->setLastLineNumber(lastLine);
m_token.m_type = m_lexer->lex(&m_token, lexerFlags, strictMode());
- if (UNLIKELY(m_token.m_type == CONSTTOKEN && m_vm->shouldRewriteConstAsVar()))
- m_token.m_type = VAR;
}
ALWAYS_INLINE void nextExpectIdentifier(unsigned lexerFlags = 0)
Modified: trunk/Source/_javascript_Core/runtime/VM.h (198931 => 198932)
--- trunk/Source/_javascript_Core/runtime/VM.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/_javascript_Core/runtime/VM.h 2016-04-01 00:24:18 UTC (rev 198932)
@@ -598,8 +598,6 @@
JS_EXPORT_PRIVATE void queueMicrotask(JSGlobalObject*, PassRefPtr<Microtask>);
JS_EXPORT_PRIVATE void drainMicrotasks();
- JS_EXPORT_PRIVATE void setShouldRewriteConstAsVar(bool shouldRewrite) { m_shouldRewriteConstAsVar = shouldRewrite; }
- ALWAYS_INLINE bool shouldRewriteConstAsVar() { return m_shouldRewriteConstAsVar; }
inline bool shouldTriggerTermination(ExecState*);
@@ -658,7 +656,6 @@
Exception* m_lastException { nullptr };
bool m_failNextNewCodeBlock { false };
bool m_inDefineOwnProperty;
- bool m_shouldRewriteConstAsVar { false };
bool m_shouldBuildPCToCodeOriginMapping { false };
std::unique_ptr<CodeCache> m_codeCache;
LegacyProfiler* m_enabledProfiler;
Modified: trunk/Source/WebCore/ChangeLog (198931 => 198932)
--- trunk/Source/WebCore/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
@@ -1,3 +1,19 @@
+2016-03-31 Saam barati <sbar...@apple.com>
+
+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * bindings/js/JSDOMWindowBase.cpp:
+ (WebCore::JSDOMWindowBase::commonVM):
+ * page/Settings.cpp:
+ * page/Settings.h:
+ (WebCore::Settings::shouldUseHighResolutionTimers):
+ (WebCore::Settings::backgroundShouldExtendBeyondPage):
+ (WebCore::Settings::shouldRewriteConstAsVar): Deleted.
+ (WebCore::Settings::setShouldRewriteConstAsVar): Deleted.
+
2016-03-31 Chris Dumez <cdu...@apple.com>
Unreviewed, rolling out r196854.
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp (198931 => 198932)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowBase.cpp 2016-04-01 00:24:18 UTC (rev 198932)
@@ -264,11 +264,6 @@
vm->heap.machineThreads().addCurrentThread();
#endif
-#if PLATFORM(MAC)
- if (MacApplication::isITunes() || MacApplication::isIBooks() || Settings::shouldRewriteConstAsVar())
- vm->setShouldRewriteConstAsVar(true);
-#endif
-
initNormalWorldClientData(vm);
}
Modified: trunk/Source/WebCore/page/Settings.cpp (198931 => 198932)
--- trunk/Source/WebCore/page/Settings.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-04-01 00:24:18 UTC (rev 198932)
@@ -97,7 +97,6 @@
bool Settings::gShouldUseHighResolutionTimers = true;
#endif
-bool Settings::gShouldRewriteConstAsVar = false;
bool Settings::gShouldRespectPriorityInCSSAttributeSetters = false;
bool Settings::gLowPowerVideoAudioBufferSizeEnabled = false;
bool Settings::gResourceLoadStatisticsEnabledEnabled = false;
Modified: trunk/Source/WebCore/page/Settings.h (198931 => 198932)
--- trunk/Source/WebCore/page/Settings.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebCore/page/Settings.h 2016-04-01 00:24:18 UTC (rev 198932)
@@ -183,9 +183,6 @@
static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
#endif
- static bool shouldRewriteConstAsVar() { return gShouldRewriteConstAsVar; }
- static void setShouldRewriteConstAsVar(bool shouldRewriteConstAsVar) { gShouldRewriteConstAsVar = shouldRewriteConstAsVar; }
-
WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; }
@@ -366,7 +363,6 @@
#if PLATFORM(WIN)
static bool gShouldUseHighResolutionTimers;
#endif
- WEBCORE_EXPORT static bool gShouldRewriteConstAsVar;
static bool gShouldRespectPriorityInCSSAttributeSetters;
#if PLATFORM(IOS)
static bool gNetworkDataUsageTrackingEnabled;
Modified: trunk/Source/WebKit2/ChangeLog (198931 => 198932)
--- trunk/Source/WebKit2/ChangeLog 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-01 00:24:18 UTC (rev 198932)
@@ -1,3 +1,19 @@
+2016-03-31 Saam barati <sbar...@apple.com>
+
+ Revert rewrite const as var workaround
+ https://bugs.webkit.org/show_bug.cgi?id=155393
+
+ Reviewed by Mark Lam.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::initializeWebProcess):
+
2016-03-31 Chris Dumez <cdu...@apple.com>
[iOS] Both WebPage's volatility timer and WebProcess's processSuspensionCleanupTimer are trying to make surfaces volatile with very short interval
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (198931 => 198932)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2016-04-01 00:24:18 UTC (rev 198932)
@@ -99,7 +99,6 @@
encoder << resourceLoadStatisticsEnabled;
encoder << fontWhitelist;
encoder << iconDatabaseEnabled;
- encoder << shouldRewriteConstAsVar;
encoder << terminationTimeout;
encoder << languages;
encoder << textCheckerState;
@@ -220,8 +219,6 @@
return false;
if (!decoder.decode(parameters.iconDatabaseEnabled))
return false;
- if (!decoder.decode(parameters.shouldRewriteConstAsVar))
- return false;
if (!decoder.decode(parameters.terminationTimeout))
return false;
if (!decoder.decode(parameters.languages))
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (198931 => 198932)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2016-04-01 00:24:18 UTC (rev 198932)
@@ -112,7 +112,6 @@
Vector<String> fontWhitelist;
bool iconDatabaseEnabled;
- bool shouldRewriteConstAsVar { false };
double terminationTimeout;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (198931 => 198932)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2016-04-01 00:24:18 UTC (rev 198932)
@@ -172,10 +172,6 @@
parameters.shouldEnableMemoryPressureReliefLogging = [defaults boolForKey:@"LogMemoryJetsamDetails"];
parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
-#if PLATFORM(MAC)
- parameters.shouldRewriteConstAsVar = MacApplication::isIBooks();
-#endif
-
#if HAVE(HOSTED_CORE_ANIMATION)
#if !PLATFORM(IOS)
parameters.acceleratedCompositingPort = MachSendRight::create([CARemoteLayerServer sharedServer].serverPort);
Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (198931 => 198932)
--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-03-31 23:59:18 UTC (rev 198931)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-04-01 00:24:18 UTC (rev 198932)
@@ -329,8 +329,6 @@
for (auto& scheme : parameters.urlSchemesRegisteredAsAlwaysRevalidated)
registerURLSchemeAsAlwaysRevalidated(scheme);
- WebCore::Settings::setShouldRewriteConstAsVar(parameters.shouldRewriteConstAsVar);
-
#if ENABLE(CACHE_PARTITIONING)
for (auto& scheme : parameters.urlSchemesRegisteredAsCachePartitioned)
registerURLSchemeAsCachePartitioned(scheme);
