Changeset 60753 in webkit for trunk/WebCore/rendering/RenderFrameSet.cpp

Timestamp:

Jun 5, 2010, 8:21:55 AM (15 years ago)

Author:

[email protected]

Message:

2010-05-30 Antonio Gomes <​[email protected]>

Reviewed by Darin Adler.

Add a convenient helper getter for Frame* to RenderObject
​https://bugs.webkit.org/show_bug.cgi?id=39928

document()->frame() is being called enough from RenderObject derivated classes
that it worth adding a helper Frame getter as a shortcut.

No behavior change, so no new tests.

• accessibility/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::isOffScreen): (WebCore::AccessibilityRenderObject::stringValue): (WebCore::AccessibilityRenderObject::selection): (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
• page/EventHandler.cpp: (WebCore::canAutoscroll):
• rendering/InlineTextBox.cpp: (WebCore::InlineTextBox::paint): (WebCore::InlineTextBox::paintCustomHighlight): (WebCore::InlineTextBox::paintTextMatchMarker):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::paintCaret):
• rendering/RenderBox.cpp: (WebCore::RenderBox::paintCustomHighlight):
• rendering/RenderDataGrid.cpp: (WebCore::RenderDataGrid::isActive):
• rendering/RenderFrameSet.cpp: (WebCore::RenderFrameSet::flattenFrameSet):
• rendering/RenderImage.cpp: (WebCore::RenderImage::paintFocusRings):
• rendering/RenderInline.cpp: (WebCore::RenderInline::addDashboardRegions):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::~RenderLayer): (WebCore::RenderLayer::panScrollFromPoint): (WebCore::RenderLayer::scrollByRecursively): (WebCore::RenderLayer::scrollToOffset): (WebCore::RenderLayer::autoscroll): (WebCore::RenderLayer::isActive): (showLayerTree):
• rendering/RenderLayerBacking.cpp: (WebCore::inspectorTimelineAgent):
• rendering/RenderListBox.cpp: (WebCore::RenderListBox::paintItemForeground): (WebCore::RenderListBox::paintItemBackground): (WebCore::RenderListBox::panScroll): (WebCore::RenderListBox::autoscroll): (WebCore::RenderListBox::isActive):
• rendering/RenderObject.cpp: (WebCore::RenderObject::~RenderObject): (WebCore::RenderObject::selectionBackgroundColor): (WebCore::RenderObject::selectionForegroundColor): (WebCore::RenderObject::destroy): (WebCore::RenderObject::addDashboardRegions): (WebCore::RenderObject::animation):
• rendering/RenderObject.h: (WebCore::RenderObject::document): (WebCore::RenderObject::frame):

File:

• trunk/WebCore/rendering/RenderFrameSet.cpp (modified) (2 diffs)

trunk/WebCore/rendering/RenderFrameSet.cpp

@@ -647 +647 @@
 bool RenderFrameSet::flattenFrameSet() const
 {
-    return document()->frame() && document()->frame()->settings()->frameFlatteningEnabled();
+    return frame() && frame()->settings()->frameFlatteningEnabled();
 }
 
@@ -715 +715 @@
             toRenderFrameSet(ancestor)->m_isChildResizing = isResizing;
     }
-    if (Frame* frame = document()->frame())
+    if (Frame* frame = this->frame())
         frame->eventHandler()->setResizingFrameSet(isResizing ? frameSet() : 0);
 }