Title: [105099] branches/safari-534.54-branch/Source/WebCore
Diff
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (105098 => 105099)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-16 23:46:32 UTC (rev 105098)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-16 23:46:39 UTC (rev 105099)
@@ -1,3 +1,20 @@
+2012-01-16 Mark Rowe <[email protected]>
+
+ Merge r104378.
+
+ 2012-01-06 Mark Rowe <[email protected]>
+
+ REGRESSION (r83075): Save as PDF does not generate any links for webkit.org and others
+ <http://webkit.org/b/75768> <rdar://problem/10659258>
+
+ Use RenderObject::hasOutline when determining whether to always create line boxes so that
+ we take in to consideration whether we'll be creating PDF link rects.
+
+ Reviewed by Dan Bernstein.
+
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::styleDidChange):
+
2011-1-16 Lucas Forschler <[email protected]>
Merge 91324
Modified: branches/safari-534.54-branch/Source/WebCore/rendering/RenderInline.cpp (105098 => 105099)
--- branches/safari-534.54-branch/Source/WebCore/rendering/RenderInline.cpp 2012-01-16 23:46:32 UTC (rev 105098)
+++ branches/safari-534.54-branch/Source/WebCore/rendering/RenderInline.cpp 2012-01-16 23:46:39 UTC (rev 105099)
@@ -147,7 +147,7 @@
m_lineHeight = -1;
if (!m_alwaysCreateLineBoxes) {
- bool alwaysCreateLineBoxes = hasSelfPaintingLayer() || hasBoxDecorations() || style()->hasPadding() || style()->hasMargin() || style()->hasOutline();
+ bool alwaysCreateLineBoxes = hasSelfPaintingLayer() || hasBoxDecorations() || style()->hasPadding() || style()->hasMargin() || hasOutline();
if (oldStyle && alwaysCreateLineBoxes) {
dirtyLineBoxes(false);
setNeedsLayout(true);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
