Title: [149054] trunk/Source/WebCore
- Revision
- 149054
- Author
- benja...@webkit.org
- Date
- 2013-04-24 12:35:31 -0700 (Wed, 24 Apr 2013)
Log Message
Remove wxWebKit #ifdefs from WebCore/page
https://bugs.webkit.org/show_bug.cgi?id=115079
Reviewed by Geoffrey Garen.
* page/FrameView.cpp:
(WebCore::FrameView::wheelEvent):
* page/Settings.cpp:
(WebCore):
* page/Settings.h:
(Settings):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (149053 => 149054)
--- trunk/Source/WebCore/ChangeLog 2013-04-24 19:34:50 UTC (rev 149053)
+++ trunk/Source/WebCore/ChangeLog 2013-04-24 19:35:31 UTC (rev 149054)
@@ -1,3 +1,17 @@
+2013-04-24 Benjamin Poulain <benja...@webkit.org>
+
+ Remove wxWebKit #ifdefs from WebCore/page
+ https://bugs.webkit.org/show_bug.cgi?id=115079
+
+ Reviewed by Geoffrey Garen.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::wheelEvent):
+ * page/Settings.cpp:
+ (WebCore):
+ * page/Settings.h:
+ (Settings):
+
2013-04-24 Chris Fleizach <cfleiz...@apple.com>
AX: WAI-ARIA landmarks no longer speak type of landmark on iOS
Modified: trunk/Source/WebCore/page/FrameView.cpp (149053 => 149054)
--- trunk/Source/WebCore/page/FrameView.cpp 2013-04-24 19:34:50 UTC (rev 149053)
+++ trunk/Source/WebCore/page/FrameView.cpp 2013-04-24 19:35:31 UTC (rev 149054)
@@ -4044,10 +4044,8 @@
if (!canHaveScrollbars())
return false;
-#if !PLATFORM(WX)
if (platformWidget())
return false;
-#endif
#if ENABLE(THREADED_SCROLLING)
if (Page* page = m_frame->page()) {
Modified: trunk/Source/WebCore/page/Settings.cpp (149053 => 149054)
--- trunk/Source/WebCore/page/Settings.cpp 2013-04-24 19:34:50 UTC (rev 149053)
+++ trunk/Source/WebCore/page/Settings.cpp 2013-04-24 19:35:31 UTC (rev 149054)
@@ -102,7 +102,7 @@
bool Settings::gMockScrollbarsEnabled = false;
bool Settings::gUsesOverlayScrollbars = false;
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
bool Settings::gShouldUseHighResolutionTimers = true;
#endif
@@ -500,7 +500,7 @@
m_showTiledScrollingIndicator = enabled;
}
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
void Settings::setShouldUseHighResolutionTimers(bool shouldUseHighResolutionTimers)
{
gShouldUseHighResolutionTimers = shouldUseHighResolutionTimers;
Modified: trunk/Source/WebCore/page/Settings.h (149053 => 149054)
--- trunk/Source/WebCore/page/Settings.h 2013-04-24 19:34:50 UTC (rev 149053)
+++ trunk/Source/WebCore/page/Settings.h 2013-04-24 19:35:31 UTC (rev 149054)
@@ -209,7 +209,7 @@
void setShowTiledScrollingIndicator(bool);
bool showTiledScrollingIndicator() const { return m_showTiledScrollingIndicator; }
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
static void setShouldUseHighResolutionTimers(bool);
static bool shouldUseHighResolutionTimers() { return gShouldUseHighResolutionTimers; }
#endif
@@ -347,7 +347,7 @@
#if USE(SAFARI_THEME)
static bool gShouldPaintNativeControls;
#endif
-#if PLATFORM(WIN) || (OS(WINDOWS) && PLATFORM(WX))
+#if PLATFORM(WIN)
static bool gShouldUseHighResolutionTimers;
#endif
static bool gShouldRespectPriorityInCSSAttributeSetters;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
