[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
ossy at webkit.org
ossy at webkit.org
Wed Dec 22 17:54:08 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4c3cb621e05238c9dc03d52826d4d8efc2b2c40d
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 2 10:50:33 2010 +0000
Unreviewed trivial buildfix after r73117.
* page/FrameView.cpp:
(WebCore::FrameView::calculateScrollbarModesForLayout):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73120 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 7472771..64f203f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-02 Csaba Osztrogonác <ossy at webkit.org>
+
+ Unreviewed trivial buildfix after r73117.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::calculateScrollbarModesForLayout):
+
2010-12-02 Yuqiang Xian <yuqiang.xian at intel.com>
Reviewed by Pavel Feldman.
diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp
index 1a7b6f0..b14d11b 100644
--- a/WebCore/page/FrameView.cpp
+++ b/WebCore/page/FrameView.cpp
@@ -515,7 +515,7 @@ void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
}
} else if (rootRenderer) {
#if ENABLE(SVG)
- if (!documentElement->isSVGElement()) {
+ if (!documentElement->isSVGElement())
applyOverflowToViewport(rootRenderer, hMode, vMode);
#else
applyOverflowToViewport(rootRenderer, hMode, vMode);
@@ -523,7 +523,7 @@ void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, Scrollbar
}
}
}
-}
+
#if USE(ACCELERATED_COMPOSITING)
void FrameView::updateCompositingLayers()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list