Commit 8a2bb060 authored by bdakin's avatar bdakin
Browse files

Reviewed by Geoff.

        Build fix from my last check-in. Make hasOutlineAnnotation() non-
        inline so that we don't have to include Document.h in 
        RenderObject.h
        Doing so causes a build failure in WebKit, and it probably isn't a 
        good idea anyway.

        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::hasOutlineAnnotation):
        * rendering/RenderObject.h:
        (WebCore::RenderObject::hasOutline):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17054 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f1dbe6ac
2006-10-13 Beth Dakin <bdakin@apple.com>
Reviewed by Geoff.
Build fix from my last check-in. Make hasOutlineAnnotation() non-
inline so that we don't have to include Document.h in
RenderObject.h
Doing so causes a build failure in WebKit, and it probably isn't a
good idea anyway.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::hasOutlineAnnotation):
* rendering/RenderObject.h:
(WebCore::RenderObject::hasOutline):
2006-10-13 Beth Dakin <bdakin@apple.com>
 
Patch written mostly by Ken Kraisler, but also by me.
......@@ -33,6 +33,7 @@
#include "CounterNode.h"
#include "CounterResetNode.h"
#include "Decoder.h"
#include "Document.h"
#include "Element.h"
#include "EventNames.h"
#include "FloatRect.h"
......@@ -2368,6 +2369,11 @@ RenderView* RenderObject::view() const
return static_cast<RenderView*>(document()->renderer());
}
bool RenderObject::hasOutlineAnnotation() const
{
return element() && element()->isLink() && document()->printing();
}
RenderObject *RenderObject::container() const
{
// This method is extremely similar to containingBlock(), but with a few notable
......
......@@ -29,7 +29,6 @@
#include "CachedResourceClient.h"
#include "DeprecatedValueList.h"
#include "Document.h"
#include "RenderStyle.h"
#include "ScrollBar.h"
#include "VisiblePosition.h"
......@@ -347,8 +346,8 @@ public:
void setNode(Node* node) { m_node = node; }
Node* node() const { return m_node; }
bool hasOutlineAnnotation() { return element() && element()->isLink() && document()->printing(); }
bool hasOutline() { return style()->hasOutline() || hasOutlineAnnotation(); }
bool hasOutlineAnnotation() const;
bool hasOutline() const { return style()->hasOutline() || hasOutlineAnnotation(); }
/**
* returns the object containing this one. can be different from parent for
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment