[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
ossy at webkit.org
ossy at webkit.org
Thu Feb 4 21:23:53 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 64629182e4ffbbe13abfaaf5db2a1314dba89b46
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jan 21 22:31:15 2010 +0000
Unreviewed buildfix after r53644.
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::scroll): missing HAVE(ACCESSIBILITY) guard added.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53651 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cfeaed8..7876716 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-01-21 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed buildfix after r53644.
+
+ * platform/Scrollbar.cpp:
+ (WebCore::Scrollbar::scroll): missing HAVE(ACCESSIBILITY) guard added.
+
2010-01-21 Darin Fisher <darin at chromium.org>
Reviewed by David Levin.
diff --git a/WebCore/platform/Scrollbar.cpp b/WebCore/platform/Scrollbar.cpp
index 8e0909e..95f198e 100644
--- a/WebCore/platform/Scrollbar.cpp
+++ b/WebCore/platform/Scrollbar.cpp
@@ -119,6 +119,7 @@ void Scrollbar::setSteps(int lineStep, int pageStep, int pixelsPerStep)
bool Scrollbar::scroll(ScrollDirection direction, ScrollGranularity granularity, float multiplier)
{
+#if HAVE(ACCESSIBILITY)
if (AXObjectCache::accessibilityEnabled()) {
if (parent() && parent()->isFrameView()) {
Document* document = static_cast<FrameView*>(parent())->frame()->document();
@@ -128,6 +129,7 @@ bool Scrollbar::scroll(ScrollDirection direction, ScrollGranularity granularity,
cache->postNotification(axObject, document, AXObjectCache::AXValueChanged, true);
}
}
+#endif
float step = 0;
if ((direction == ScrollUp && m_orientation == VerticalScrollbar) || (direction == ScrollLeft && m_orientation == HorizontalScrollbar))
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list