[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 13:19:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 551f6f33acd41a65cef3f339dcb5c73aa977e508
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Sep 11 01:03:34 2010 +0000
2010-09-10 Adam Barth <abarth at webkit.org>
Attempted build fix for Qt Minimal.
* dom/Element.cpp:
(WebCore::Element::getBoundingClientRect):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67257 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67cca0e..b6610c7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-10 Adam Barth <abarth at webkit.org>
+
+ Attempted build fix for Qt Minimal.
+
+ * dom/Element.cpp:
+ (WebCore::Element::getBoundingClientRect):
+
2010-09-10 Dan Bernstein <mitz at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebCore/dom/Element.cpp b/WebCore/dom/Element.cpp
index c7086c8..5f53c2d 100644
--- a/WebCore/dom/Element.cpp
+++ b/WebCore/dom/Element.cpp
@@ -479,6 +479,7 @@ PassRefPtr<ClientRect> Element::getBoundingClientRect() const
document()->updateLayoutIgnorePendingStylesheets();
Vector<FloatQuad> quads;
+#if ENABLE(SVG)
if (isSVGElement()) {
// Get the bounding rectangle from the SVG model.
const SVGElement* svgElement = static_cast<const SVGElement*>(this);
@@ -488,7 +489,9 @@ PassRefPtr<ClientRect> Element::getBoundingClientRect() const
quads.append(renderer()->localToAbsoluteQuad(localRect));
}
}
- } else {
+ } else
+#endif
+ {
// Get the bounding rectangle from the box model.
if (renderBoxModelObject())
renderBoxModelObject()->absoluteQuads(quads);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list