Title: [132539] trunk/Source/WebCore
- Revision
- 132539
- Author
- [email protected]
- Date
- 2012-10-25 15:20:17 -0700 (Thu, 25 Oct 2012)
Log Message
Unreviewed, fix the build on Mac.
Putting the getter in the Settings.h caused the global variable to be inlined and needing it to be exported.
Instead, put the implementation in the cpp file.
* page/Settings.cpp:
(WebCore::Settings::defaultMinDOMTimerInterval):
(WebCore):
(WebCore::Settings::defaultDOMTimerAlignmentInterval):
* page/Settings.h:
(Settings):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (132538 => 132539)
--- trunk/Source/WebCore/ChangeLog 2012-10-25 21:49:22 UTC (rev 132538)
+++ trunk/Source/WebCore/ChangeLog 2012-10-25 22:20:17 UTC (rev 132539)
@@ -1,5 +1,19 @@
2012-10-25 Tony Chang <[email protected]>
+ Unreviewed, fix the build on Mac.
+
+ Putting the getter in the Settings.h caused the global variable to be inlined and needing it to be exported.
+ Instead, put the implementation in the cpp file.
+
+ * page/Settings.cpp:
+ (WebCore::Settings::defaultMinDOMTimerInterval):
+ (WebCore):
+ (WebCore::Settings::defaultDOMTimerAlignmentInterval):
+ * page/Settings.h:
+ (Settings):
+
+2012-10-25 Tony Chang <[email protected]>
+
Move default DOM Timer values into Settings
https://bugs.webkit.org/show_bug.cgi?id=100405
Modified: trunk/Source/WebCore/page/Settings.cpp (132538 => 132539)
--- trunk/Source/WebCore/page/Settings.cpp 2012-10-25 21:49:22 UTC (rev 132538)
+++ trunk/Source/WebCore/page/Settings.cpp 2012-10-25 22:20:17 UTC (rev 132539)
@@ -703,6 +703,11 @@
gDefaultMinDOMTimerInterval = interval;
}
+double Settings::defaultMinDOMTimerInterval()
+{
+ return gDefaultMinDOMTimerInterval;
+}
+
void Settings::setMinDOMTimerInterval(double interval)
{
m_page->setMinimumTimerInterval(interval);
@@ -718,6 +723,11 @@
gDefaultDOMTimerAlignmentInterval = interval;
}
+double Settings::defaultDOMTimerAlignmentInterval()
+{
+ return gDefaultDOMTimerAlignmentInterval;
+}
+
void Settings::setDOMTimerAlignmentInterval(double interval)
{
m_page->setTimerAlignmentInterval(interval);
Modified: trunk/Source/WebCore/page/Settings.h (132538 => 132539)
--- trunk/Source/WebCore/page/Settings.h 2012-10-25 21:49:22 UTC (rev 132538)
+++ trunk/Source/WebCore/page/Settings.h 2012-10-25 22:20:17 UTC (rev 132539)
@@ -257,13 +257,13 @@
bool isDOMPasteAllowed() const { return m_isDOMPasteAllowed; }
static void setDefaultMinDOMTimerInterval(double); // Interval specified in seconds.
- static double defaultMinDOMTimerInterval() { return gDefaultMinDOMTimerInterval; }
+ static double defaultMinDOMTimerInterval();
void setMinDOMTimerInterval(double); // Per-page; initialized to default value.
double minDOMTimerInterval();
static void setDefaultDOMTimerAlignmentInterval(double);
- static double defaultDOMTimerAlignmentInterval() { return gDefaultDOMTimerAlignmentInterval; }
+ static double defaultDOMTimerAlignmentInterval();
void setDOMTimerAlignmentInterval(double);
double domTimerAlignmentInterval() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
