- Revision
- 133813
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-07 15:37:12 -0800 (Wed, 07 Nov 2012)
Log Message
Clean up confused use of Document::renderer and renderView
https://bugs.webkit.org/show_bug.cgi?id=101484
Patch by Elliott Sprehn <espr...@chromium.org> on 2012-11-07
Reviewed by Ojan Vafai.
Document::renderer and Document::renderView are the same thing, but it seems
people don't always realize it and check if document()->renderer() is a RenderView.
This patch cleans up usage of document()->renderer() and document()->renderView() and
simplifies the code that was written without realizing they were the same thing.
No new tests, this is just a refactor.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::visiblePositionForPoint): Lots of simplification.
* dom/Element.cpp:
(WebCore::Element::screenRect):
(WebCore::Element::unregisterNamedFlowContentNode): Remove unneeded conditional.
* editing/FrameSelection.cpp: Remove verbose casts.
(WebCore::clearRenderViewSelection):
(WebCore::FrameSelection::recomputeCaretRect):
(WebCore::CaretBase::invalidateCaretRect):
(WebCore::FrameSelection::focusedOrActiveStateChanged):
* page/Frame.cpp:
(WebCore::Frame::contentRenderer): Vastly simplified.
* page/PrintContext.cpp: Remove verbose casts.
(WebCore::PrintContext::computePageRects):
(WebCore::PrintContext::computePageRectsWithPageSizeInternal):
* page/wince/FrameWinCE.cpp:
(WebCore::computePageRectsForFrame): Remove unreachable code.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::maximalOutlineSize): Remove verbose cast.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (133812 => 133813)
--- trunk/Source/WebCore/ChangeLog 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/ChangeLog 2012-11-07 23:37:12 UTC (rev 133813)
@@ -1,3 +1,38 @@
+2012-11-07 Elliott Sprehn <espr...@chromium.org>
+
+ Clean up confused use of Document::renderer and renderView
+ https://bugs.webkit.org/show_bug.cgi?id=101484
+
+ Reviewed by Ojan Vafai.
+
+ Document::renderer and Document::renderView are the same thing, but it seems
+ people don't always realize it and check if document()->renderer() is a RenderView.
+
+ This patch cleans up usage of document()->renderer() and document()->renderView() and
+ simplifies the code that was written without realizing they were the same thing.
+
+ No new tests, this is just a refactor.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::visiblePositionForPoint): Lots of simplification.
+ * dom/Element.cpp:
+ (WebCore::Element::screenRect):
+ (WebCore::Element::unregisterNamedFlowContentNode): Remove unneeded conditional.
+ * editing/FrameSelection.cpp: Remove verbose casts.
+ (WebCore::clearRenderViewSelection):
+ (WebCore::FrameSelection::recomputeCaretRect):
+ (WebCore::CaretBase::invalidateCaretRect):
+ (WebCore::FrameSelection::focusedOrActiveStateChanged):
+ * page/Frame.cpp:
+ (WebCore::Frame::contentRenderer): Vastly simplified.
+ * page/PrintContext.cpp: Remove verbose casts.
+ (WebCore::PrintContext::computePageRects):
+ (WebCore::PrintContext::computePageRectsWithPageSizeInternal):
+ * page/wince/FrameWinCE.cpp:
+ (WebCore::computePageRectsForFrame): Remove unreachable code.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::maximalOutlineSize): Remove verbose cast.
+
2012-11-07 Adam Barth <aba...@webkit.org>
[V8] IntrusiveDOMWrapperMap should be usable for more than just Nodes
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (133812 => 133813)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -1899,20 +1899,16 @@
{
if (!m_renderer)
return VisiblePosition();
-
+
// convert absolute point to view coordinates
- Document* topDoc = topDocument();
- if (!topDoc || !topDoc->renderer() || !topDoc->renderer()->view())
- return VisiblePosition();
-
- FrameView* frameView = topDoc->renderer()->view()->frameView();
- if (!frameView)
- return VisiblePosition();
-
RenderView* renderView = topRenderer();
if (!renderView)
return VisiblePosition();
-
+
+ FrameView* frameView = renderView->frameView();
+ if (!frameView)
+ return VisiblePosition();
+
Node* innerNode = 0;
// locate the node containing the point
Modified: trunk/Source/WebCore/dom/Element.cpp (133812 => 133813)
--- trunk/Source/WebCore/dom/Element.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -649,7 +649,7 @@
if (!renderer())
return IntRect();
// FIXME: this should probably respect transforms
- return renderer()->view()->frameView()->contentsToScreen(renderer()->absoluteBoundingBoxRectIgnoringTransforms());
+ return document()->view()->contentsToScreen(renderer()->absoluteBoundingBoxRectIgnoringTransforms());
}
static inline bool shouldIgnoreAttributeCase(const Element* e)
@@ -1130,10 +1130,8 @@
void Element::unregisterNamedFlowContentNode()
{
- if (document()->cssRegionsEnabled() && inNamedFlow()) {
- if (document()->renderer() && document()->renderer()->view())
- document()->renderer()->view()->flowThreadController()->unregisterNamedFlowContentNode(this);
- }
+ if (document()->cssRegionsEnabled() && inNamedFlow() && document()->renderView())
+ document()->renderView()->flowThreadController()->unregisterNamedFlowContentNode(this);
}
void Element::detach()
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (133812 => 133813)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -337,7 +337,7 @@
{
RefPtr<Document> document = position.anchorNode()->document();
document->updateStyleIfNeeded();
- if (RenderView* view = toRenderView(document->renderer()))
+ if (RenderView* view = document->renderView())
view->clearSelection();
}
@@ -1342,7 +1342,7 @@
m_absoluteCaretRepaintBounds = caretRepaintRect(m_selection.start().deprecatedNode());
#if ENABLE(TEXT_CARET)
- if (RenderView* view = toRenderView(m_frame->document()->renderer())) {
+ if (RenderView* view = m_frame->document()->renderView()) {
// FIXME: make caret repainting container-aware.
view->repaintRectangleInViewAndCompositedLayers(oldAbsoluteCaretRepaintBounds, false);
if (shouldRepaintCaret(view, isContentEditable()))
@@ -1383,9 +1383,11 @@
// away after clicking.
m_caretRectNeedsUpdate = true;
- if (!caretRectChanged) {
- RenderView* view = toRenderView(node->document()->renderer());
- if (view && shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))
+ if (caretRectChanged)
+ return;
+
+ if (RenderView* view = node->document()->renderView()) {
+ if (shouldRepaintCaret(view, node->isContentEditable(Node::UserSelectAllIsAlwaysNonEditable)))
view->repaintRectangleInViewAndCompositedLayers(caretRepaintRect(node), false);
}
}
@@ -1652,7 +1654,7 @@
// Because RenderObject::selectionBackgroundColor() and
// RenderObject::selectionForegroundColor() check if the frame is active,
// we have to update places those colors were painted.
- if (RenderView* view = toRenderView(m_frame->document()->renderer()))
+ if (RenderView* view = m_frame->document()->renderView())
view->repaintRectangleInViewAndCompositedLayers(enclosingIntRect(bounds()));
// Caret appears in the active frame.
Modified: trunk/Source/WebCore/page/Frame.cpp (133812 => 133813)
--- trunk/Source/WebCore/page/Frame.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/page/Frame.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -607,14 +607,7 @@
RenderView* Frame::contentRenderer() const
{
- Document* doc = document();
- if (!doc)
- return 0;
- RenderObject* object = doc->renderer();
- if (!object)
- return 0;
- ASSERT(object->isRenderView());
- return toRenderView(object);
+ return document() ? document()->renderView() : 0;
}
RenderPart* Frame::ownerRenderer() const
Modified: trunk/Source/WebCore/page/PrintContext.cpp (133812 => 133813)
--- trunk/Source/WebCore/page/PrintContext.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/page/PrintContext.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -60,7 +60,7 @@
m_pageRects.clear();
outPageHeight = 0;
- if (!m_frame->document() || !m_frame->view() || !m_frame->document()->renderer())
+ if (!m_frame->document() || !m_frame->view() || !m_frame->document()->renderView())
return;
if (userScaleFactor <= 0) {
@@ -68,7 +68,7 @@
return;
}
- RenderView* view = toRenderView(m_frame->document()->renderer());
+ RenderView* view = m_frame->document()->renderView();
const IntRect& documentRect = view->documentRect();
FloatSize pageSize = m_frame->resizePageRectsKeepingRatio(FloatSize(printRect.width(), printRect.height()), FloatSize(documentRect.width(), documentRect.height()));
float pageWidth = pageSize.width();
@@ -93,10 +93,10 @@
void PrintContext::computePageRectsWithPageSizeInternal(const FloatSize& pageSizeInPixels, bool allowInlineDirectionTiling)
{
- if (!m_frame->document() || !m_frame->view() || !m_frame->document()->renderer())
+ if (!m_frame->document() || !m_frame->view() || !m_frame->document()->renderView())
return;
- RenderView* view = toRenderView(m_frame->document()->renderer());
+ RenderView* view = m_frame->document()->renderView();
IntRect docRect = view->documentRect();
Modified: trunk/Source/WebCore/page/wince/FrameWinCE.cpp (133812 => 133813)
--- trunk/Source/WebCore/page/wince/FrameWinCE.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/page/wince/FrameWinCE.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -59,16 +59,11 @@
pages.clear();
outPageHeight = 0;
- if (!frame->document() || !frame->view() || !frame->document()->renderer())
+ if (!frame->document() || !frame->view() || !frame->document()->renderView())
return;
- RenderView* root = toRenderView(frame->document()->renderer());
+ RenderView* root = frame->document()->renderView();
- if (!root) {
- LOG_ERROR("document to be printed has no renderer");
- return;
- }
-
if (userScaleFactor <= 0) {
LOG_ERROR("userScaleFactor has bad value %.2f", userScaleFactor);
return;
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (133812 => 133813)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-07 23:34:30 UTC (rev 133812)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-11-07 23:37:12 UTC (rev 133813)
@@ -2841,7 +2841,7 @@
{
if (p != PaintPhaseOutline && p != PaintPhaseSelfOutline && p != PaintPhaseChildOutlines)
return 0;
- return toRenderView(document()->renderer())->maximalOutlineSize();
+ return view()->maximalOutlineSize();
}
int RenderObject::caretMinOffset() const
