Title: [200166] trunk/Source/WebCore
- Revision
- 200166
- Author
- sbar...@apple.com
- Date
- 2016-04-27 18:54:12 -0700 (Wed, 27 Apr 2016)
Log Message
Move the implementation of Settings::globalConstRedeclarationShouldThrow into the cpp file
https://bugs.webkit.org/show_bug.cgi?id=157109
Rubber-stamped by Geoffrey Garen.
* page/Settings.cpp:
(WebCore::Settings::networkInterfaceName):
(WebCore::Settings::globalConstRedeclarationShouldThrow):
* page/Settings.h:
(WebCore::Settings::shouldUseHighResolutionTimers):
(WebCore::Settings::backgroundShouldExtendBeyondPage):
(WebCore::Settings::globalConstRedeclarationShouldThrow): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200165 => 200166)
--- trunk/Source/WebCore/ChangeLog 2016-04-28 01:53:31 UTC (rev 200165)
+++ trunk/Source/WebCore/ChangeLog 2016-04-28 01:54:12 UTC (rev 200166)
@@ -1,3 +1,18 @@
+2016-04-27 Saam barati <sbar...@apple.com>
+
+ Move the implementation of Settings::globalConstRedeclarationShouldThrow into the cpp file
+ https://bugs.webkit.org/show_bug.cgi?id=157109
+
+ Rubber-stamped by Geoffrey Garen.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::networkInterfaceName):
+ (WebCore::Settings::globalConstRedeclarationShouldThrow):
+ * page/Settings.h:
+ (WebCore::Settings::shouldUseHighResolutionTimers):
+ (WebCore::Settings::backgroundShouldExtendBeyondPage):
+ (WebCore::Settings::globalConstRedeclarationShouldThrow): Deleted.
+
2016-04-27 Dean Jackson <d...@apple.com>
RTL non-native <select> buttons should have arrows on the left
Modified: trunk/Source/WebCore/page/Settings.cpp (200165 => 200166)
--- trunk/Source/WebCore/page/Settings.cpp 2016-04-28 01:53:31 UTC (rev 200165)
+++ trunk/Source/WebCore/page/Settings.cpp 2016-04-28 01:54:12 UTC (rev 200166)
@@ -43,6 +43,7 @@
#include "MainFrame.h"
#include "Page.h"
#include "PageCache.h"
+#include "RuntimeApplicationChecks.h"
#include "StorageMap.h"
#include "TextAutosizer.h"
#include <limits>
@@ -757,4 +758,15 @@
}
#endif
+bool Settings::globalConstRedeclarationShouldThrow()
+{
+#if PLATFORM(MAC)
+ return !MacApplication::isIBooks();
+#elif PLATFORM(IOS)
+ return !IOSApplication::isIBooks();
+#else
+ return true;
+#endif
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/page/Settings.h (200165 => 200166)
--- trunk/Source/WebCore/page/Settings.h 2016-04-28 01:53:31 UTC (rev 200165)
+++ trunk/Source/WebCore/page/Settings.h 2016-04-28 01:54:12 UTC (rev 200166)
@@ -30,7 +30,6 @@
#include "ClipboardAccessPolicy.h"
#include "EditingBehaviorTypes.h"
#include "IntSize.h"
-#include "RuntimeApplicationChecks.h"
#include "SecurityOrigin.h"
#include "SettingsMacros.h"
#include "TextFlags.h"
@@ -190,16 +189,7 @@
static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
#endif
- static bool globalConstRedeclarationShouldThrow()
- {
-#if PLATFORM(MAC)
- return !MacApplication::isIBooks();
-#elif PLATFORM(IOS)
- return !IOSApplication::isIBooks();
-#else
- return true;
-#endif
- }
+ static bool globalConstRedeclarationShouldThrow();
WEBCORE_EXPORT void setBackgroundShouldExtendBeyondPage(bool);
bool backgroundShouldExtendBeyondPage() const { return m_backgroundShouldExtendBeyondPage; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
