Title: [199782] trunk/Source/WebCore
- Revision
- 199782
- Author
- [email protected]
- Date
- 2016-04-20 13:21:21 -0700 (Wed, 20 Apr 2016)
Log Message
Attempt to fix non-INDEXED_DATABASE_IN_WORKERS builds after r199779
* testing/InternalSettings.cpp:
(WebCore::InternalSettings::Backup::Backup):
(WebCore::InternalSettings::Backup::restoreTo):
(WebCore::InternalSettings::setIndexedDBWorkersEnabled):
* testing/InternalSettings.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (199781 => 199782)
--- trunk/Source/WebCore/ChangeLog 2016-04-20 19:57:10 UTC (rev 199781)
+++ trunk/Source/WebCore/ChangeLog 2016-04-20 20:21:21 UTC (rev 199782)
@@ -1,3 +1,13 @@
+2016-04-20 Brady Eidson <[email protected]>
+
+ Attempt to fix non-INDEXED_DATABASE_IN_WORKERS builds after r199779
+
+ * testing/InternalSettings.cpp:
+ (WebCore::InternalSettings::Backup::Backup):
+ (WebCore::InternalSettings::Backup::restoreTo):
+ (WebCore::InternalSettings::setIndexedDBWorkersEnabled):
+ * testing/InternalSettings.h:
+
2016-04-20 Chris Dumez <[email protected]>
Potential overflow in RenderLayer::hitTestList()
Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (199781 => 199782)
--- trunk/Source/WebCore/testing/InternalSettings.cpp 2016-04-20 19:57:10 UTC (rev 199781)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp 2016-04-20 20:21:21 UTC (rev 199782)
@@ -103,7 +103,9 @@
#endif
, m_allowsInlineMediaPlayback(settings.allowsInlineMediaPlayback())
, m_inlineMediaPlaybackRequiresPlaysInlineAttribute(settings.inlineMediaPlaybackRequiresPlaysInlineAttribute())
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
, m_indexedDBWorkersEnabled(RuntimeEnabledFeatures::sharedFeatures().indexedDBWorkersEnabled())
+#endif
{
}
@@ -171,7 +173,9 @@
settings.setAllowsInlineMediaPlayback(m_allowsInlineMediaPlayback);
settings.setInlineMediaPlaybackRequiresPlaysInlineAttribute(m_inlineMediaPlaybackRequiresPlaysInlineAttribute);
RuntimeEnabledFeatures::sharedFeatures().setPluginReplacementEnabled(m_pluginReplacementEnabled);
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(m_indexedDBWorkersEnabled);
+#endif
}
class InternalSettingsWrapper : public Supplement<Page> {
@@ -546,6 +550,8 @@
{
#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
RuntimeEnabledFeatures::sharedFeatures().setIndexedDBWorkersEnabled(enabled);
+#else
+ UNUSED_PARAM(enabled);
#endif
}
Modified: trunk/Source/WebCore/testing/InternalSettings.h (199781 => 199782)
--- trunk/Source/WebCore/testing/InternalSettings.h 2016-04-20 19:57:10 UTC (rev 199781)
+++ trunk/Source/WebCore/testing/InternalSettings.h 2016-04-20 20:21:21 UTC (rev 199782)
@@ -99,7 +99,9 @@
#endif
bool m_allowsInlineMediaPlayback;
bool m_inlineMediaPlaybackRequiresPlaysInlineAttribute;
+#if ENABLE(INDEXED_DATABASE_IN_WORKERS)
bool m_indexedDBWorkersEnabled;
+#endif
};
static Ref<InternalSettings> create(Page* page)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes