Changeset 17052 in webkit

Timestamp:

Oct 13, 2006 6:12:32 PM (18 years ago)

Author:

bdakin

Message:

Patch written mostly by Ken Kraisler, but also by me.

Reviewed by Hyatt.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=10216 and <rdar://
problem/3391162> PDF created by printing should have live
hyperlinks

• platform/GraphicsContext.cpp: (WebCore::GraphicsContext::focusRingBoundingRect):
• platform/GraphicsContext.h:
• platform/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::setURLForRect):
• platform/cg/GraphicsContextCG.cpp: (WebCore::GraphicsContext::setURLForRect): Implement method to add URL link to PDF document.
• rendering/InlineFlowBox.cpp: (WebCore::InlineFlowBox::paint): Ask hasOutline() instead of querying the outline width
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintObject): Same as above.
• rendering/RenderFlow.cpp: (WebCore::RenderFlow::paintLines): Call the new paintOutline() (WebCore::RenderFlow::paintOutline): Take care of focus ring and pdf url rects, and outline painting.
• rendering/RenderFlow.h:
• rendering/RenderObject.cpp: (WebCore::RenderObject::addPDFURLRect): Declaration to apply a PDF link to a rectanglular region. (WebCore::RenderObject::paintOutline): Take care of pdf rects as well as focus ring painting.
• rendering/RenderObject.h: (WebCore::RenderObject::hasOutlineAnnotation): Returns true is the element is a link and we are printing. (WebCore::RenderObject::hasOutline): Returns true is the style has an outline and hasOutlineAnnotation() is true.
• rendering/RenderStyle.h: (WebCore::RenderStyle::hasOutline): Returns true if outlineWidth is greater than 0 and outlineStyle is greater than BHIDDEN.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/GraphicsContext.cpp (modified) (1 diff)
• platform/GraphicsContext.h (modified) (3 diffs)
• platform/cairo/GraphicsContextCairo.cpp (modified) (1 diff)
• platform/cg/GraphicsContextCG.cpp (modified) (2 diffs)
• rendering/InlineFlowBox.cpp (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderFlow.cpp (modified) (2 diffs)
• rendering/RenderFlow.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (5 diffs)
• rendering/RenderObject.h (modified) (3 diffs)
• rendering/RenderStyle.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-13  Beth Dakin  <bdakin@apple.com>
+
+        Patch written mostly by Ken Kraisler, but also by me.
+
+        Reviewed by Hyatt.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=10216 and <rdar://
+        problem/3391162> PDF created by printing should have live 
+        hyperlinks
+
+        * platform/GraphicsContext.cpp:
+        (WebCore::GraphicsContext::focusRingBoundingRect):
+        * platform/GraphicsContext.h:
+        * platform/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::setURLForRect):
+        * platform/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::setURLForRect): Implement method to add 
+        URL link to PDF document.
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paint): Ask hasOutline() instead of 
+        querying the outline width
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintObject): Same as above.
+        * rendering/RenderFlow.cpp:
+        (WebCore::RenderFlow::paintLines): Call the new paintOutline()
+        (WebCore::RenderFlow::paintOutline): Take care of focus ring and 
+        pdf url rects, and outline painting.
+        * rendering/RenderFlow.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::addPDFURLRect): Declaration to apply a PDF 
+        link to a rectanglular region.
+        (WebCore::RenderObject::paintOutline): Take care of pdf rects as 
+        well as focus ring painting.
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::hasOutlineAnnotation): Returns true is the 
+        element is a link and we are printing.
+        (WebCore::RenderObject::hasOutline): Returns true is the style has 
+        an outline and hasOutlineAnnotation() is true.
+        * rendering/RenderStyle.h:
+        (WebCore::RenderStyle::hasOutline): Returns true if outlineWidth is 
+        greater than 0 and outlineStyle is greater than BHIDDEN.
+
 2006-10-13  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/platform/GraphicsContext.cpp

@@ -217 +217 @@
 }
 
+IntRect GraphicsContext::focusRingBoundingRect()
+{
+    IntRect result = IntRect(0, 0, 0, 0);
+    
+    const Vector<IntRect>& rects = focusRingRects();
+    unsigned rectCount = rects.size();
+    for (unsigned i = 0; i < rectCount; i++)
+        result.unite(rects[i]);
+        
+    return result;
+}
+
 void GraphicsContext::addFocusRingRect(const IntRect& rect)
 {

trunk/WebCore/platform/GraphicsContext.h

@@ -61 +61 @@
     class GraphicsContextPrivate;
     class GraphicsContextPlatformPrivate;
+    class KURL;
     class Path;
     class TextRun;
@@ -146 +147 @@
         void drawFocusRing(const Color&);
         void clearFocusRing();
+        IntRect focusRingBoundingRect();
 
         void setLineWidth(float);
@@ -162 +164 @@
         void translate(float x, float y);
         IntPoint origin();
+        
+        void setURLForRect(const KURL&, const IntRect&);
 
         void concatCTM(const AffineTransform&);

trunk/WebCore/platform/cairo/GraphicsContextCairo.cpp

@@ -461 +461 @@
 }
 
+void GraphicsContext::setURLForRect(const KURL& link, const IntRect& destRect)
+{
+}
+
 } // namespace WebCore
 

trunk/WebCore/platform/cg/GraphicsContextCG.cpp

@@ -31 +31 @@
 
 #include "AffineTransform.h"
+#include "KURL.h"
 #include "Path.h"
 #include <wtf/MathExtras.h>
@@ -778 +779 @@
 }
 
+void GraphicsContext::setURLForRect(const KURL& link, const IntRect& destRect)
+{
+    if (paintingDisabled())
+        return;
+        
+    CFURLRef urlRef = link.createCFURL();
+    if (urlRef) {
+        CGContextRef context = platformContext();
+        
+        // Get the bounding box to handle clipping.
+        CGRect box = CGContextGetClipBoundingBox(context);
+
+        IntRect intBox((int)box.origin.x, (int)box.origin.y, (int)box.size.width, (int)box.size.height);
+        IntRect rect = destRect;
+        rect.intersect(intBox);
+
+        CGPDFContextSetURLForRect(context, urlRef,
+            CGRectApplyAffineTransform(rect, CGContextGetCTM(context)));
+
+        CFRelease(urlRef);
+    }
+}
+
 }
 

trunk/WebCore/rendering/InlineFlowBox.cpp

@@ -551 +551 @@
             // Add ourselves to the paint info struct's list of inlines that need to paint their
             // outlines.
-            if (object()->style()->visibility() == VISIBLE && object()->style()->outlineWidth() > 0 &&
+            if (object()->style()->visibility() == VISIBLE && object()->hasOutline() &&
                 !object()->isInlineContinuation() && !isRootInlineBox()) {
                 i.outlineObjects->add(flowObject());

trunk/WebCore/rendering/RenderBlock.cpp

@@ -1364 +1364 @@
     // 5. paint outline.
     if (!inlineFlow && (paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline) 
-        && style()->outlineWidth() && style()->visibility() == VISIBLE)
-        paintOutline(i.p, _tx, _ty, width(), height(), style());
+        && hasOutline() && style()->visibility() == VISIBLE)
+        RenderObject::paintOutline(i.p, _tx, _ty, width(), height(), style());
 
     // 6. paint caret.

trunk/WebCore/rendering/RenderFlow.cpp

@@ -411 +411 @@
         for (RenderFlowSequencedSet::iterator it = info.outlineObjects->begin(); it != end; ++it) {
             RenderFlow* flow = *it;
-            if (flow->style()->outlineStyleIsAuto())
-                flow->paintFocusRing(info.p, _tx, _ty);
-            else
-                flow->paintOutlines(info.p, _tx, _ty);
+            flow->paintOutline(info.p, _tx, _ty);
         }
         info.outlineObjects->clear();
@@ -688 +685 @@
 }
 
-void RenderFlow::paintFocusRing(GraphicsContext* p, int tx, int ty)
-{
-    int ow = style()->outlineWidth();
-    Color oc = style()->outlineColor();
-    if (!oc.isValid())
-        oc = style()->color();
-    
-    p->initFocusRing(ow, style()->outlineOffset());
-    addFocusRingRects(p, tx, ty);
-    p->drawFocusRing(oc);
-    p->clearFocusRing();
-}
-
-void RenderFlow::paintOutlines(GraphicsContext* p, int _tx, int _ty)
-{
-    if (style()->outlineStyle() <= BHIDDEN)
+void RenderFlow::paintOutline(GraphicsContext* p, int _tx, int _ty)
+{
+    if (!hasOutline())
         return;
     
+    if (style()->outlineStyleIsAuto() || hasOutlineAnnotation()) {
+        int ow = style()->outlineWidth();
+        Color oc = style()->outlineColor();
+        if (!oc.isValid())
+            oc = style()->color();
+        
+        p->initFocusRing(ow, style()->outlineOffset());
+        addFocusRingRects(p, _tx, _ty);
+        if (style()->outlineStyleIsAuto())
+            p->drawFocusRing(oc);
+        else
+            addPDFURLRect(p, p->focusRingBoundingRect());
+        p->clearFocusRing();
+    }
+
+    if (style()->outlineStyleIsAuto() || style()->outlineStyle() <= BHIDDEN)
+        return;
+
     DeprecatedPtrList <IntRect> rects;
     rects.setAutoDelete(true);
-    
+
     rects.append(new IntRect);
-    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox()) {
+    for (InlineRunBox* curr = firstLineBox(); curr; curr = curr->nextLineBox())
         rects.append(new IntRect(curr->xPos(), curr->yPos(), curr->width(), curr->height()));
-    }
+
     rects.append(new IntRect);
-    
+
     for (unsigned int i = 1; i < rects.count() - 1; i++)
         paintOutlineForLine(p, _tx, _ty, *rects.at(i-1), *rects.at(i), *rects.at(i+1));

trunk/WebCore/rendering/RenderFlow.h

@@ -88 +88 @@
 
     virtual void addFocusRingRects(GraphicsContext*, int _tx, int _ty);
-    void paintFocusRing(GraphicsContext*, int tx, int ty);
     void paintOutlineForLine(GraphicsContext*, int tx, int ty, const IntRect &prevLine, const IntRect &thisLine, const IntRect &nextLine);
-    void paintOutlines(GraphicsContext*, int tx, int ty);
+    void paintOutline(GraphicsContext*, int tx, int ty);
 
 protected:

trunk/WebCore/rendering/RenderObject.cpp

@@ -34 +34 @@
 #include "CounterResetNode.h"
 #include "Decoder.h"
-#include "Document.h"
 #include "Element.h"
 #include "EventNames.h"
@@ -42 +41 @@
 #include "HTMLNames.h"
 #include "HTMLOListElement.h"
+#include "KURL.h"
 #include "Position.h"
 #include "RenderArena.h"
@@ -1640 +1640 @@
 }
 
+void RenderObject::addPDFURLRect(GraphicsContext* p, IntRect rect)
+{
+    Node* node = element();
+    if (node) {
+        if (p) {
+            if (rect.width() > 0 && rect.height() > 0) {
+                Element* element = static_cast<Element*>(node);
+                String href;
+                if (element->isLink())
+                    href = element->getAttribute(hrefAttr);
+                    
+                if (!href.isNull()) {
+                    KURL link = element->document()->completeURL(href.deprecatedString());
+                    if (link.isValid())
+                        p->setURLForRect(link, rect);
+                }
+            }
+        }
+    }
+}
+
+
 void RenderObject::addFocusRingRects(GraphicsContext* p, int _tx, int _ty)
 {
@@ -1657 +1679 @@
 void RenderObject::paintOutline(GraphicsContext* p, int _tx, int _ty, int w, int h, const RenderStyle* style)
 {
+    if (!hasOutline())
+        return;
+    
     int ow = style->outlineWidth();
-    if(!ow) return;
 
     EBorderStyle os = style->outlineStyle();
-    if (os <= BHIDDEN)
-        return;
     
     Color oc = style->outlineColor();
@@ -1670 +1692 @@
     int offset = style->outlineOffset();
     
-    if (style->outlineStyleIsAuto()) {
+    if (style->outlineStyleIsAuto() || hasOutlineAnnotation()) {
         if (!theme()->supportsFocusRing(style)) {
             // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
             p->initFocusRing(ow, offset);
-            addFocusRingRects(p, _tx, _ty);
+            if (style->outlineStyleIsAuto())
+                addFocusRingRects(p, _tx, _ty);
+            else
+                addPDFURLRect(p, p->focusRingBoundingRect());
             p->drawFocusRing(oc);
             p->clearFocusRing();
         }
+    }
+
+    if (style->outlineStyleIsAuto() || style->outlineStyle() <= BHIDDEN)
         return;
-    }
 
     _tx -= offset;

trunk/WebCore/rendering/RenderObject.h

@@ -30 +30 @@
 #include "CachedResourceClient.h"
 #include "DeprecatedValueList.h"
+#include "Document.h"
 #include "RenderStyle.h"
 #include "ScrollBar.h"
@@ -347 +348 @@
     Node* node() const { return m_node; }
     
+    bool hasOutlineAnnotation() { return element() && element()->isLink() && document()->printing(); }
+    bool hasOutline() { return style()->hasOutline() || hasOutlineAnnotation(); }
+   
    /**
      * returns the object containing this one. can be different from parent for
@@ -703 +707 @@
     IntRect paintingRootRect(IntRect& topLevelRect);
 
+    void addPDFURLRect(GraphicsContext* p, IntRect rect);
+
     virtual void addFocusRingRects(GraphicsContext*, int tx, int ty);
 

trunk/WebCore/rendering/RenderStyle.h

@@ -1250 +1250 @@
         return background->m_outline.width;
     }
+    bool hasOutline() const { return outlineWidth() > 0 && outlineStyle() > BHIDDEN; }
     EBorderStyle   outlineStyle() const {  return background->m_outline.style(); }
     bool outlineStyleIsAuto() const { return background->m_outline._auto; }