[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
oliver at apple.com
oliver at apple.com
Thu Feb 4 21:22:02 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 900639c73f96bf86047172cfaeac605f457dbf1c
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 20 21:50:01 2010 +0000
2010-01-20 Oliver Hunt <oliver at apple.com>
No review, rolling out r53561.
http://trac.webkit.org/changeset/53561
https://bugs.webkit.org/show_bug.cgi?id=16318
broke selection repaint for transformed text in html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::paintSelection):
* rendering/RenderForeignObject.cpp:
* rendering/RenderForeignObject.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53562 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f4c716..d3f23f2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-20 Oliver Hunt <oliver at apple.com>
+
+ No review, rolling out r53561.
+ http://trac.webkit.org/changeset/53561
+ https://bugs.webkit.org/show_bug.cgi?id=16318
+
+ broke selection repaint for transformed text in html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::paintSelection):
+ * rendering/RenderForeignObject.cpp:
+ * rendering/RenderForeignObject.h:
+
2010-01-19 Oliver Hunt <oliver at apple.com>
Reviewed by Beth Dakin.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 61a97b3..3fd10ea 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -1957,10 +1957,8 @@ void RenderBlock::paintSelection(PaintInfo& paintInfo, int tx, int ty)
IntRect gapRectsBounds = fillSelectionGaps(this, tx, ty, tx, ty, lastTop, lastLeft, lastRight, &paintInfo);
if (!gapRectsBounds.isEmpty()) {
if (RenderLayer* layer = enclosingLayer()) {
- if (!hasLayer()) {
- FloatRect localBounds(gapRectsBounds);
- gapRectsBounds = localToContainerQuad(localBounds, layer->renderer()).enclosingBoundingBox();
- }
+ IntSize offset = hasLayer() ? IntSize() : offsetFromAncestorContainer(layer->renderer());
+ gapRectsBounds.move(offset - IntSize(tx, ty));
layer->addBlockSelectionGapsBounds(gapRectsBounds);
}
}
diff --git a/WebCore/rendering/RenderForeignObject.cpp b/WebCore/rendering/RenderForeignObject.cpp
index 6597554..573ae96 100644
--- a/WebCore/rendering/RenderForeignObject.cpp
+++ b/WebCore/rendering/RenderForeignObject.cpp
@@ -120,11 +120,6 @@ bool RenderForeignObject::nodeAtPoint(const HitTestRequest&, HitTestResult&, int
return false;
}
-void RenderForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const
-{
- SVGRenderBase::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
-}
-
} // namespace WebCore
#endif // ENABLE(SVG) && ENABLE(SVG_FOREIGN_OBJECT)
diff --git a/WebCore/rendering/RenderForeignObject.h b/WebCore/rendering/RenderForeignObject.h
index 8cb9a55..8ad223f 100644
--- a/WebCore/rendering/RenderForeignObject.h
+++ b/WebCore/rendering/RenderForeignObject.h
@@ -52,8 +52,6 @@ public:
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction);
virtual bool isSVGForeignObject() const { return true; }
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const;
-
private:
TransformationMatrix translationForAttributes() const;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list