Changeset 79875 in webkit

Timestamp:

Feb 28, 2011 9:51:03 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2011-02-28 Andreas Kling <​kling@webkit.org>

Reviewed by Darin Adler.

Use Frame::ownerElement() directly where appropriate.
​https://bugs.webkit.org/show_bug.cgi?id=55385

Don't take the roundabout way through frame->document->ownerElement
which just checks that the document->frame is non-null.

No new test, refactoring only.

• editing/SelectionController.cpp: (WebCore::SelectionController::selectFrameElementInParentIfFullySelected):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::loadWithDocumentLoader):
• page/DOMWindow.cpp: (WebCore::DOMWindow::dispatchLoadEvent):
• page/EventHandler.cpp: (WebCore::EventHandler::scrollRecursively): (WebCore::EventHandler::logicalScrollRecursively):
• page/FrameView.cpp: (WebCore::FrameView::init): (WebCore::FrameView::layout): (WebCore::FrameView::repaintContentRectangle): (WebCore::FrameView::windowClipRect): (WebCore::FrameView::paintContents):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/SelectionController.cpp (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)
• page/DOMWindow.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (2 diffs)
• page/FrameView.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Andreas Kling  <kling@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Use Frame::ownerElement() directly where appropriate.
+        https://bugs.webkit.org/show_bug.cgi?id=55385
+
+        Don't take the roundabout way through frame->document->ownerElement
+        which just checks that the document->frame is non-null.
+
+        No new test, refactoring only.
+
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::selectFrameElementInParentIfFullySelected):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::dispatchLoadEvent):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::scrollRecursively):
+        (WebCore::EventHandler::logicalScrollRecursively):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::init):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::repaintContentRectangle):
+        (WebCore::FrameView::windowClipRect):
+        (WebCore::FrameView::paintContents):
+
 2011-02-28  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/editing/SelectionController.cpp

@@ -1346 +1346 @@
 
     // Get to the <iframe> or <frame> (or even <object>) element in the parent frame.
-    Element* ownerElement = m_frame->document()->ownerElement();
+    Element* ownerElement = m_frame->ownerElement();
     if (!ownerElement)
         return;

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1484 +1484 @@
             loader->setTriggeringAction(NavigationAction(newURL, policyChecker()->loadType(), isFormSubmission));
 
-        if (Element* ownerElement = m_frame->document()->ownerElement()) {
+        if (Element* ownerElement = m_frame->ownerElement()) {
             if (!ownerElement->dispatchBeforeLoadEvent(loader->request().url().string())) {
                 continueLoadAfterNavigationPolicy(loader->request(), formState, false);

trunk/Source/WebCore/page/DOMWindow.cpp

@@ -1530 +1530 @@
     // This is a DOM extension and is independent of bubbling/capturing rules of
     // the DOM.
-    Element* ownerElement = document()->ownerElement();
+    Element* ownerElement = m_frame ? m_frame->ownerElement() : 0;
     if (ownerElement) {
         RefPtr<Event> ownerEvent = Event::create(eventNames().loadEvent, false, false);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -1039 +1039 @@
     if (!frame)
         return false;
-    return frame->eventHandler()->scrollRecursively(direction, granularity, m_frame->document()->ownerElement());
+    return frame->eventHandler()->scrollRecursively(direction, granularity, m_frame->ownerElement());
 }
 
@@ -1068 +1068 @@
         return false;
 
-    return frame->eventHandler()->logicalScrollRecursively(direction, granularity, m_frame->document()->ownerElement());
+    return frame->eventHandler()->logicalScrollRecursively(direction, granularity, m_frame->ownerElement());
 }
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -261 +261 @@
 
     // Propagate the marginwidth/height and scrolling modes to the view.
-    Element* ownerElement = m_frame && m_frame->document() ? m_frame->document()->ownerElement() : 0;
+    Element* ownerElement = m_frame ? m_frame->ownerElement() : 0;
     if (ownerElement && (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag))) {
         HTMLFrameElement* frameElt = static_cast<HTMLFrameElement*>(ownerElement);
@@ -829 +829 @@
         
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
-        if (m_firstLayout && !document->ownerElement())
+        if (m_firstLayout && !m_frame->ownerElement())
             printf("Elapsed time before first layout: %d\n", document->elapsedTime());
 #endif        
@@ -1430 +1430 @@
 void FrameView::repaintContentRectangle(const IntRect& r, bool immediate)
 {
-    ASSERT(!m_frame->document()->ownerElement());
+    ASSERT(!m_frame->ownerElement());
 
     double delay = adjustedDeferredRepaintDelay();
@@ -2019 +2019 @@
     // Set our clip rect to be our contents.
     IntRect clipRect = contentsToWindow(visibleContentRect(!clipToContents));
-    if (!m_frame || !m_frame->document() || !m_frame->document()->ownerElement())
+    if (!m_frame || !m_frame->ownerElement())
         return clipRect;
 
     // Take our owner element and get the clip rect from the enclosing layer.
-    Element* elt = m_frame->document()->ownerElement();
+    Element* elt = m_frame->ownerElement();
     RenderLayer* layer = elt->renderer()->enclosingLayer();
     // FIXME: layer should never be null, but sometimes seems to be anyway.
@@ -2244 +2244 @@
     InspectorInstrumentationCookie cookie = InspectorInstrumentation::willPaint(m_frame.get(), rect);
 
-    Document* document = frame()->document();
+    Document* document = m_frame->document();
 
 #ifndef NDEBUG
@@ -2250 +2250 @@
     if (document->printing())
         fillWithRed = false; // Printing, don't fill with red (can't remember why).
-    else if (document->ownerElement())
+    else if (m_frame->ownerElement())
         fillWithRed = false; // Subframe, don't fill with red.
     else if (isTransparent())
@@ -2298 +2298 @@
 
     bool flatteningPaint = m_paintBehavior & PaintBehaviorFlattenCompositingLayers;
-    bool isRootFrame = !document->ownerElement();
+    bool isRootFrame = !m_frame->ownerElement();
     if (flatteningPaint && isRootFrame)
         notifyWidgetsInAllFrames(WillPaintFlattened);