Changeset 40824 in webkit

Timestamp:

Feb 10, 2009 9:33:33 AM (15 years ago)

Author:

ap@webkit.org

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=23867
Eliminate obsolete frame->document() checks

• page/FrameView.cpp: (WebCore::FrameView::paintContents): Apparently due to a typo (document vs. !document), fillWithRed was always set to false, and other branches were never taken. Removing the check for document restores debug-only red color filling.

• loader/FrameLoader.cpp: (WebCore::FrameLoader::begin): Only call dispatchWindowObjectAvailable() after a document is created. A client can do anything in its delegate method, so we'd need to have frame->document() checks otherwise. DumpRenderTree uses this delegate to add its custom property, and it was crashing due to null document in JSDOMWindowBase::getOwnPropertySlot().

• bindings/js/JSDOMWindowBase.cpp: (WebCore::JSDOMWindowBase::getOwnPropertySlot):
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::addEventListener): (WebCore::JSDOMWindow::removeEventListener):
• bindings/js/JSNavigatorCustom.cpp: (WebCore::needsYouTubeQuirk):
• bindings/js/ScheduledAction.cpp: (WebCore::ScheduledAction::execute):
• bindings/js/ScriptControllerMac.mm: (WebCore::updateRenderingForBindings):
• dom/Document.cpp: (WebCore::Document::initSecurityContext):
• editing/Editor.cpp: (WebCore::Editor::deleteWithDirection): (WebCore::Editor::dispatchCPPEvent): (WebCore::Editor::applyStyle): (WebCore::Editor::applyParagraphStyle):
• editing/EditorCommand.cpp: (WebCore::Editor::Command::execute): (WebCore::Editor::Command::isEnabled): (WebCore::Editor::Command::state): (WebCore::Editor::Command::value):
• editing/SelectionController.cpp: (WebCore::SelectionController::recomputeCaretRect): (WebCore::SelectionController::selectFrameElementInParentIfFullySelected): (WebCore::SelectionController::selectAll): (WebCore::SelectionController::setFocused):
• inspector/InspectorController.cpp: (WebCore::getResourceDocumentNode):
• inspector/JavaScriptDebugServer.cpp: (WebCore::JavaScriptDebugServer::setJavaScriptPaused):
• loader/DocumentLoader.cpp: (WebCore::canonicalizedTitle): (WebCore::DocumentLoader::stopLoading): (WebCore::DocumentLoader::isLoadingInAPISense): (WebCore::DocumentLoader::subresource): (WebCore::DocumentLoader::getSubresources):
• loader/FrameLoader.cpp: (WebCore::FrameLoader::urlSelected): (WebCore::FrameLoader::stop): (WebCore::FrameLoader::iconURL): (WebCore::FrameLoader::executeIfJavaScriptURL): (WebCore::FrameLoader::clear): (WebCore::FrameLoader::endIfNotLoadingMainResource): (WebCore::FrameLoader::restoreDocumentState): (WebCore::FrameLoader::gotoAnchor): (WebCore::FrameLoader::loadDone): (WebCore::FrameLoader::checkCompleted): (WebCore::FrameLoader::checkCallImplicitClose): (WebCore::FrameLoader::scheduleRefresh): (WebCore::FrameLoader::outgoingOrigin): (WebCore::FrameLoader::canCachePageContainingThisFrame): (WebCore::FrameLoader::logCanCacheFrameDecision): (WebCore::FrameLoader::updatePolicyBaseURL): (WebCore::FrameLoader::setPolicyBaseURL): (WebCore::FrameLoader::frameDetached): (WebCore::FrameLoader::shouldScrollToAnchor): (WebCore::FrameLoader::saveDocumentState):
• loader/archive/cf/LegacyWebArchive.cpp: (WebCore::LegacyWebArchive::create):
• loader/icon/IconFetcher.cpp: (WebCore::IconFetcher::create):
• loader/icon/IconLoader.cpp: (WebCore::IconLoader::startLoading):
• page/AccessibilityRenderObject.cpp: (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
• page/Chrome.cpp: (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer): (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
• page/DOMWindow.cpp: (WebCore::DOMWindow::sessionStorage): (WebCore::DOMWindow::alert): (WebCore::DOMWindow::confirm): (WebCore::DOMWindow::prompt): (WebCore::DOMWindow::scrollX): (WebCore::DOMWindow::scrollY): (WebCore::DOMWindow::getMatchedCSSRules): (WebCore::DOMWindow::openDatabase): (WebCore::DOMWindow::scrollBy): (WebCore::DOMWindow::scrollTo):
• page/EventHandler.cpp: (WebCore::EventHandler::allowDHTMLDrag): (WebCore::EventHandler::scrollOverflow): (WebCore::EventHandler::handleMousePressEvent): (WebCore::EventHandler::handleMouseDoubleClickEvent): (WebCore::EventHandler::handleMouseMoveEvent): (WebCore::EventHandler::handleMouseReleaseEvent): (WebCore::EventHandler::updateDragAndDrop): (WebCore::EventHandler::handleWheelEvent): (WebCore::EventHandler::sendContextMenuEvent): (WebCore::EventHandler::capsLockStateMayHaveChanged): (WebCore::EventHandler::sendResizeEvent): (WebCore::EventHandler::sendScrollEvent):
• page/FocusController.cpp: (WebCore::deepFocusableNode): (WebCore::FocusController::advanceFocus):
• page/Frame.cpp: (WebCore::Frame::setFocusedNodeIfNeeded): (WebCore::Frame::shouldApplyTextZoom): (WebCore::Frame::shouldApplyPageZoom): (WebCore::Frame::setZoomFactor): (WebCore::Frame::setPrinting): (WebCore::Frame::reapplyStyles): (WebCore::Frame::isContentEditable): (WebCore::Frame::computeAndSetTypingStyle): (WebCore::Frame::selectionComputedStyle): (WebCore::Frame::applyEditingStyleToBodyElement): (WebCore::Frame::removeEditingStyleFromBodyElement): (WebCore::Frame::contentRenderer): (WebCore::Frame::styleForSelectionStart): (WebCore::Frame::setSelectionFromNone): (WebCore::Frame::findString): (WebCore::Frame::markAllMatchesForText): (WebCore::Frame::setMarkedTextMatchesAreHighlighted): (WebCore::Frame::documentTypeString): (WebCore::Frame::shouldClose): (WebCore::Frame::respondToChangedSelection):
• page/FrameView.cpp: (WebCore::FrameView::~FrameView): (WebCore::FrameView::createScrollbar): (WebCore::FrameView::layout): (WebCore::FrameView::layoutTimerFired): (WebCore::FrameView::scheduleRelayout): (WebCore::FrameView::needsLayout): (WebCore::FrameView::unscheduleRelayout): (WebCore::FrameView::windowClipRect):
• page/Geolocation.cpp: (WebCore::Geolocation::disconnectFrame):
• page/Page.cpp: (WebCore::networkStateChanged): (WebCore::Page::~Page): (WebCore::Page::unmarkAllTextMatches): (WebCore::Page::setMediaVolume):
• page/animation/AnimationController.cpp: (WebCore::AnimationControllerPrivate::updateRenderingDispatcherFired):
• page/mac/EventHandlerMac.mm: (WebCore::EventHandler::currentKeyboardEvent): (WebCore::EventHandler::needsKeyboardEventDisambiguationQuirks):
• page/mac/FrameMac.mm: (WebCore::Frame::dashboardRegionsDictionary): (WebCore::Frame::setUserStyleSheetLocation): (WebCore::Frame::setUserStyleSheet):
• storage/LocalStorageArea.cpp: (WebCore::LocalStorageArea::dispatchStorageEvent):
• storage/SessionStorageArea.cpp: (WebCore::SessionStorageArea::dispatchStorageEvent):
• svg/graphics/SVGImage.cpp: (WebCore::SVGImage::setContainerSize): (WebCore::SVGImage::usesContainerSize): (WebCore::SVGImage::size): (WebCore::SVGImage::hasRelativeWidth): (WebCore::SVGImage::hasRelativeHeight): Removed frame->document() checks.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMWindowBase.cpp (modified) (1 diff)
• bindings/js/JSDOMWindowCustom.cpp (modified) (2 diffs)
• bindings/js/JSNavigatorCustom.cpp (modified) (1 diff)
• bindings/js/ScheduledAction.cpp (modified) (1 diff)
• bindings/js/ScriptControllerMac.mm (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• editing/Editor.cpp (modified) (4 diffs)
• editing/EditorCommand.cpp (modified) (4 diffs)
• editing/SelectionController.cpp (modified) (4 diffs)
• inspector/InspectorController.cpp (modified) (1 diff)
• inspector/JavaScriptDebugServer.cpp (modified) (1 diff)
• loader/DocumentLoader.cpp (modified) (5 diffs)
• loader/FrameLoader.cpp (modified) (25 diffs)
• loader/archive/cf/LegacyWebArchive.cpp (modified) (1 diff)
• loader/icon/IconFetcher.cpp (modified) (1 diff)
• loader/icon/IconLoader.cpp (modified) (1 diff)
• page/AccessibilityRenderObject.cpp (modified) (1 diff)
• page/Chrome.cpp (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (10 diffs)
• page/EventHandler.cpp (modified) (12 diffs)
• page/FocusController.cpp (modified) (4 diffs)
• page/Frame.cpp (modified) (24 diffs)
• page/FrameView.cpp (modified) (10 diffs)
• page/Geolocation.cpp (modified) (1 diff)
• page/Page.cpp (modified) (4 diffs)
• page/animation/AnimationController.cpp (modified) (1 diff)
• page/mac/EventHandlerMac.mm (modified) (2 diffs)
• page/mac/FrameMac.mm (modified) (3 diffs)
• storage/LocalStorageArea.cpp (modified) (1 diff)
• storage/SessionStorageArea.cpp (modified) (1 diff)
• svg/graphics/SVGImage.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-02-10  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=23867
+        Eliminate obsolete frame->document() checks
+
+        * page/FrameView.cpp: (WebCore::FrameView::paintContents): Apparently due to a typo
+        (document vs. !document), fillWithRed was always set to false, and other branches were
+        never taken. Removing the check for document restores debug-only red color filling.
+
+        * loader/FrameLoader.cpp: (WebCore::FrameLoader::begin): Only call dispatchWindowObjectAvailable()
+        after a document is created. A client can do anything in its delegate method, so we'd need
+        to have frame->document() checks otherwise. DumpRenderTree uses this delegate to add its
+        custom property, and it was crashing due to null document in JSDOMWindowBase::getOwnPropertySlot().
+
+        * bindings/js/JSDOMWindowBase.cpp:
+        (WebCore::JSDOMWindowBase::getOwnPropertySlot):
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::addEventListener):
+        (WebCore::JSDOMWindow::removeEventListener):
+        * bindings/js/JSNavigatorCustom.cpp:
+        (WebCore::needsYouTubeQuirk):
+        * bindings/js/ScheduledAction.cpp:
+        (WebCore::ScheduledAction::execute):
+        * bindings/js/ScriptControllerMac.mm:
+        (WebCore::updateRenderingForBindings):
+        * dom/Document.cpp:
+        (WebCore::Document::initSecurityContext):
+        * editing/Editor.cpp:
+        (WebCore::Editor::deleteWithDirection):
+        (WebCore::Editor::dispatchCPPEvent):
+        (WebCore::Editor::applyStyle):
+        (WebCore::Editor::applyParagraphStyle):
+        * editing/EditorCommand.cpp:
+        (WebCore::Editor::Command::execute):
+        (WebCore::Editor::Command::isEnabled):
+        (WebCore::Editor::Command::state):
+        (WebCore::Editor::Command::value):
+        * editing/SelectionController.cpp:
+        (WebCore::SelectionController::recomputeCaretRect):
+        (WebCore::SelectionController::selectFrameElementInParentIfFullySelected):
+        (WebCore::SelectionController::selectAll):
+        (WebCore::SelectionController::setFocused):
+        * inspector/InspectorController.cpp:
+        (WebCore::getResourceDocumentNode):
+        * inspector/JavaScriptDebugServer.cpp:
+        (WebCore::JavaScriptDebugServer::setJavaScriptPaused):
+        * loader/DocumentLoader.cpp:
+        (WebCore::canonicalizedTitle):
+        (WebCore::DocumentLoader::stopLoading):
+        (WebCore::DocumentLoader::isLoadingInAPISense):
+        (WebCore::DocumentLoader::subresource):
+        (WebCore::DocumentLoader::getSubresources):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::urlSelected):
+        (WebCore::FrameLoader::stop):
+        (WebCore::FrameLoader::iconURL):
+        (WebCore::FrameLoader::executeIfJavaScriptURL):
+        (WebCore::FrameLoader::clear):
+        (WebCore::FrameLoader::endIfNotLoadingMainResource):
+        (WebCore::FrameLoader::restoreDocumentState):
+        (WebCore::FrameLoader::gotoAnchor):
+        (WebCore::FrameLoader::loadDone):
+        (WebCore::FrameLoader::checkCompleted):
+        (WebCore::FrameLoader::checkCallImplicitClose):
+        (WebCore::FrameLoader::scheduleRefresh):
+        (WebCore::FrameLoader::outgoingOrigin):
+        (WebCore::FrameLoader::canCachePageContainingThisFrame):
+        (WebCore::FrameLoader::logCanCacheFrameDecision):
+        (WebCore::FrameLoader::updatePolicyBaseURL):
+        (WebCore::FrameLoader::setPolicyBaseURL):
+        (WebCore::FrameLoader::frameDetached):
+        (WebCore::FrameLoader::shouldScrollToAnchor):
+        (WebCore::FrameLoader::saveDocumentState):
+        * loader/archive/cf/LegacyWebArchive.cpp:
+        (WebCore::LegacyWebArchive::create):
+        * loader/icon/IconFetcher.cpp:
+        (WebCore::IconFetcher::create):
+        * loader/icon/IconLoader.cpp:
+        (WebCore::IconLoader::startLoading):
+        * page/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::visiblePositionForPoint):
+        * page/Chrome.cpp:
+        (WebCore::PageGroupLoadDeferrer::PageGroupLoadDeferrer):
+        (WebCore::PageGroupLoadDeferrer::~PageGroupLoadDeferrer):
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::sessionStorage):
+        (WebCore::DOMWindow::alert):
+        (WebCore::DOMWindow::confirm):
+        (WebCore::DOMWindow::prompt):
+        (WebCore::DOMWindow::scrollX):
+        (WebCore::DOMWindow::scrollY):
+        (WebCore::DOMWindow::getMatchedCSSRules):
+        (WebCore::DOMWindow::openDatabase):
+        (WebCore::DOMWindow::scrollBy):
+        (WebCore::DOMWindow::scrollTo):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::allowDHTMLDrag):
+        (WebCore::EventHandler::scrollOverflow):
+        (WebCore::EventHandler::handleMousePressEvent):
+        (WebCore::EventHandler::handleMouseDoubleClickEvent):
+        (WebCore::EventHandler::handleMouseMoveEvent):
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        (WebCore::EventHandler::updateDragAndDrop):
+        (WebCore::EventHandler::handleWheelEvent):
+        (WebCore::EventHandler::sendContextMenuEvent):
+        (WebCore::EventHandler::capsLockStateMayHaveChanged):
+        (WebCore::EventHandler::sendResizeEvent):
+        (WebCore::EventHandler::sendScrollEvent):
+        * page/FocusController.cpp:
+        (WebCore::deepFocusableNode):
+        (WebCore::FocusController::advanceFocus):
+        * page/Frame.cpp:
+        (WebCore::Frame::setFocusedNodeIfNeeded):
+        (WebCore::Frame::shouldApplyTextZoom):
+        (WebCore::Frame::shouldApplyPageZoom):
+        (WebCore::Frame::setZoomFactor):
+        (WebCore::Frame::setPrinting):
+        (WebCore::Frame::reapplyStyles):
+        (WebCore::Frame::isContentEditable):
+        (WebCore::Frame::computeAndSetTypingStyle):
+        (WebCore::Frame::selectionComputedStyle):
+        (WebCore::Frame::applyEditingStyleToBodyElement):
+        (WebCore::Frame::removeEditingStyleFromBodyElement):
+        (WebCore::Frame::contentRenderer):
+        (WebCore::Frame::styleForSelectionStart):
+        (WebCore::Frame::setSelectionFromNone):
+        (WebCore::Frame::findString):
+        (WebCore::Frame::markAllMatchesForText):
+        (WebCore::Frame::setMarkedTextMatchesAreHighlighted):
+        (WebCore::Frame::documentTypeString):
+        (WebCore::Frame::shouldClose):
+        (WebCore::Frame::respondToChangedSelection):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::~FrameView):
+        (WebCore::FrameView::createScrollbar):
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::layoutTimerFired):
+        (WebCore::FrameView::scheduleRelayout):
+        (WebCore::FrameView::needsLayout):
+        (WebCore::FrameView::unscheduleRelayout):
+        (WebCore::FrameView::windowClipRect):
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::disconnectFrame):
+        * page/Page.cpp:
+        (WebCore::networkStateChanged):
+        (WebCore::Page::~Page):
+        (WebCore::Page::unmarkAllTextMatches):
+        (WebCore::Page::setMediaVolume):
+        * page/animation/AnimationController.cpp:
+        (WebCore::AnimationControllerPrivate::updateRenderingDispatcherFired):
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::EventHandler::currentKeyboardEvent):
+        (WebCore::EventHandler::needsKeyboardEventDisambiguationQuirks):
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::dashboardRegionsDictionary):
+        (WebCore::Frame::setUserStyleSheetLocation):
+        (WebCore::Frame::setUserStyleSheet):
+        * storage/LocalStorageArea.cpp:
+        (WebCore::LocalStorageArea::dispatchStorageEvent):
+        * storage/SessionStorageArea.cpp:
+        (WebCore::SessionStorageArea::dispatchStorageEvent):
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::setContainerSize):
+        (WebCore::SVGImage::usesContainerSize):
+        (WebCore::SVGImage::size):
+        (WebCore::SVGImage::hasRelativeWidth):
+        (WebCore::SVGImage::hasRelativeHeight):
+        Removed frame->document() checks.
+
 2009-02-10  Adam Treat  <adam.treat@torchmobile.com>
 

trunk/WebCore/bindings/js/JSDOMWindowBase.cpp

@@ -610 +610 @@
     // Allow shortcuts like 'Image1' instead of document.images.Image1
     Document* document = impl()->frame()->document();
-    if (document && document->isHTMLDocument()) {
+    if (document->isHTMLDocument()) {
         AtomicStringImpl* atomicPropertyName = AtomicString::find(propertyName);
         if (atomicPropertyName && (static_cast<HTMLDocument*>(document)->hasNamedItem(atomicPropertyName) || document->hasElementWithId(atomicPropertyName))) {

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -269 +269 @@
         return jsUndefined();
 
-    if (RefPtr<JSEventListener> listener = findOrCreateJSEventListener(exec, args.at(exec, 1))) {
-        if (Document* doc = frame->document())
-            doc->addWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener.release(), args.at(exec, 2).toBoolean(exec));
-    }
+    if (RefPtr<JSEventListener> listener = findOrCreateJSEventListener(exec, args.at(exec, 1)))
+        frame->document()->addWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener.release(), args.at(exec, 2).toBoolean(exec));
 
     return jsUndefined();
@@ -283 +281 @@
         return jsUndefined();
 
-    if (JSEventListener* listener = findJSEventListener(args.at(exec, 1))) {
-        if (Document* doc = frame->document())
-            doc->removeWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener, args.at(exec, 2).toBoolean(exec));
-    }
+    if (JSEventListener* listener = findJSEventListener(args.at(exec, 1)))
+        frame->document()->removeWindowEventListener(AtomicString(args.at(exec, 0).toString(exec)), listener, args.at(exec, 2).toBoolean(exec));
 
     return jsUndefined();

trunk/WebCore/bindings/js/JSNavigatorCustom.cpp

@@ -77 +77 @@
 
     Document* document = frame->document();
-    // FIXME: The document is never null, so we should remove this check along with the
-    // other similar ones in this file when we are absolutely sure it's safe.
-    if (!document)
-        return false;
 
     // Do the quirk only on the front page of the global version of YouTube.

trunk/WebCore/bindings/js/ScheduledAction.cpp

@@ -133 +133 @@
     // for all possible entry points that might possibly execute script, but this seems
     // to be a bit too low-level.
-    if (Document* document = frame->document())
-        document->updateRendering();
+    frame->document()->updateRendering();
 
     frame->script()->setProcessingTimerCallback(false);

trunk/WebCore/bindings/js/ScriptControllerMac.mm

@@ -158 +158 @@
         return;
 
-    Document* document = frame->document();
-    if (!document)
-        return;
-
-    document->updateRendering();
+    frame->document()->updateRendering();
 }
 

trunk/WebCore/dom/Document.cpp

@@ -4159 +4159 @@
         ownerFrame = m_frame->loader()->opener();
 
-    if (ownerFrame && ownerFrame->document()) {
+    if (ownerFrame) {
         m_cookieURL = ownerFrame->document()->cookieURL();
         // We alias the SecurityOrigins to match Firefox, see Bug 15313

trunk/WebCore/editing/Editor.cpp

@@ -223 +223 @@
 bool Editor::deleteWithDirection(SelectionController::EDirection direction, TextGranularity granularity, bool killRing, bool isTypingAction)
 {
-    if (!canEdit() || !m_frame->document())
+    if (!canEdit())
         return false;
 
@@ -690 +690 @@
 {
     Node* target = m_frame->selection()->start().element();
-    if (!target && m_frame->document())
+    if (!target)
         target = m_frame->document()->body();
     if (!target)
@@ -719 +719 @@
             break;
         case VisibleSelection::RangeSelection:
-            if (m_frame->document() && style)
+            if (style)
                 applyCommand(ApplyStyleCommand::create(m_frame->document(), style, editingAction));
             break;
@@ -738 +738 @@
         case VisibleSelection::CaretSelection:
         case VisibleSelection::RangeSelection:
-            if (m_frame->document() && style)
+            if (style)
                 applyCommand(ApplyStyleCommand::create(m_frame->document(), style, editingAction, ApplyStyleCommand::ForceBlockProperties));
             break;

trunk/WebCore/editing/EditorCommand.cpp

@@ -1444 +1444 @@
     if (!isEnabled(triggeringEvent)) {
         // Let certain commands be executed when performed explicitly even if they are disabled.
-        if (!isSupported() || !m_frame || !m_frame->document() || !m_command->allowExecutionWhenDisabled)
+        if (!isSupported() || !m_frame || !m_command->allowExecutionWhenDisabled)
             return false;
     }
@@ -1463 +1463 @@
 bool Editor::Command::isEnabled(Event* triggeringEvent) const
 {
-    if (!isSupported() || !m_frame || !m_frame->document())
+    if (!isSupported() || !m_frame)
         return false;
     return m_command->isEnabled(m_frame.get(), triggeringEvent, m_source);
@@ -1470 +1470 @@
 TriState Editor::Command::state(Event* triggeringEvent) const
 {
-    if (!isSupported() || !m_frame || !m_frame->document())
+    if (!isSupported() || !m_frame)
         return FalseTriState;
     return m_command->state(m_frame.get(), triggeringEvent);
@@ -1477 +1477 @@
 String Editor::Command::value(Event* triggeringEvent) const
 {
-    if (!isSupported() || !m_frame || !m_frame->document())
+    if (!isSupported() || !m_frame)
         return String();
     return m_command->value(m_frame.get(), triggeringEvent);

trunk/WebCore/editing/SelectionController.cpp

@@ -831 +831 @@
 bool SelectionController::recomputeCaretRect()
 {
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return false;
         
@@ -1044 +1044 @@
     // Get to the <iframe> or <frame> (or even <object>) element in the parent frame.
     Document* doc = m_frame->document();
-    if (!doc)
-        return;
     Element* ownerElement = doc->ownerElement();
     if (!ownerElement)
@@ -1073 +1071 @@
 {
     Document* document = m_frame->document();
-    if (!document)
-        return;
     
     if (document->focusedNode() && document->focusedNode()->canSelectAll()) {
@@ -1208 +1204 @@
     focusedOrActiveStateChanged();
 
-    if (Document* doc = m_frame->document())
-        doc->dispatchWindowEvent(flag ? eventNames().focusEvent : eventNames().blurEvent, false, false);
+    m_frame->document()->dispatchWindowEvent(flag ? eventNames().focusEvent : eventNames().blurEvent, false, false);
 }
 

trunk/WebCore/inspector/InspectorController.cpp

@@ -669 +669 @@
 
     Document* document = frame->document();
-    if (!document)
-        return undefined;
 
     if (document->isPluginDocument() || document->isImageDocument() || document->isMediaDocument())

trunk/WebCore/inspector/JavaScriptDebugServer.cpp

@@ -364 +364 @@
     frame->script()->setPaused(paused);
 
-    if (Document* document = frame->document()) {
-        if (paused)
-            document->suspendActiveDOMObjects();
-        else
-            document->resumeActiveDOMObjects();
-    }
+    Document* document = frame->document();
+    if (paused)
+        document->suspendActiveDOMObjects();
+    else
+        document->resumeActiveDOMObjects();
 
     setJavaScriptPaused(frame->view(), paused);

trunk/WebCore/loader/DocumentLoader.cpp

@@ -115 +115 @@
     
     // Replace the backslashes with currency symbols if the encoding requires it.
-    if (frame->document())
-        frame->document()->displayBufferModifiedByEncoding(buffer.characters(), buffer.length());
+    frame->document()->displayBufferModifiedByEncoding(buffer.characters(), buffer.length());
 
     return String::adopt(buffer);
@@ -293 +292 @@
         Document* doc = m_frame->document();
         
-        if (loading || (doc && doc->parsing()))
+        if (loading || doc->parsing())
             m_frame->loader()->stopLoading(false);
     }
@@ -469 +468 @@
         if (!m_subresourceLoaders.isEmpty())
             return true;
-        if (Document* doc = m_frame->document()) {
-            if (doc->docLoader()->requestCount())
+        Document* doc = m_frame->document();
+        if (doc->docLoader()->requestCount())
+            return true;
+        if (Tokenizer* tok = doc->tokenizer())
+            if (tok->processingData())
                 return true;
-            if (Tokenizer* tok = doc->tokenizer())
-                if (tok->processingData())
-                    return true;
-        }
     }
     return frameLoader()->subframeIsLoading();
@@ -553 +551 @@
     
     Document* doc = m_frame->document();
-    if (!doc)
-        return archiveResourceForURL(url);
         
     CachedResource* resource = doc->docLoader()->cachedResource(url);
@@ -569 +565 @@
 
     Document* document = m_frame->document();
-    if (!document)
-        return;
 
     const DocLoader::DocumentResourceMap& allResources = document->docLoader()->allCachedResources();

trunk/WebCore/loader/FrameLoader.cpp

@@ -411 +411 @@
 
     String target = _target;
-    if (target.isEmpty() && m_frame->document())
+    if (target.isEmpty())
         target = m_frame->document()->baseTarget();
 
@@ -646 +646 @@
     RefPtr<Frame> protector(m_frame);
     
-    if (m_frame->document()) {
-        if (m_frame->document()->tokenizer())
-            m_frame->document()->tokenizer()->stopParsing();
-        m_frame->document()->finishParsing();
-    } else
-        // WebKit partially uses WebCore when loading non-HTML docs.  In these cases doc==nil, but
-        // WebCore is enough involved that we need to checkCompleted() in order for m_bComplete to
-        // become true. An example is when a subframe is a pure text doc, and that subframe is the
-        // last one to complete.
-        checkCompleted();
+    if (m_frame->document()->tokenizer())
+        m_frame->document()->tokenizer()->stopParsing();
+    m_frame->document()->finishParsing();
+
     if (m_iconLoader)
         m_iconLoader->stopLoading();
@@ -684 +678 @@
 
     // If we have an iconURL from a Link element, return that
-    if (m_frame->document() && !m_frame->document()->iconURL().isEmpty())
+    if (!m_frame->document()->iconURL().isEmpty())
         return KURL(m_frame->document()->iconURL());
 
@@ -758 +752 @@
 
     SecurityOrigin* currentSecurityOrigin = 0;
-    if (m_frame->document())
-        currentSecurityOrigin = m_frame->document()->securityOrigin();
+    currentSecurityOrigin = m_frame->document()->securityOrigin();
 
     // FIXME: We should always replace the document, but doing so
@@ -816 +809 @@
     m_needsClear = false;
     
-    if (m_frame->document() && !m_frame->document()->inPageCache()) {
+    if (!m_frame->document()->inPageCache()) {
         m_frame->document()->cancelParsing();
         m_frame->document()->stopActiveDOMObjects();
@@ -913 +906 @@
     RefPtr<SecurityOrigin> forcedSecurityOrigin = origin;
 
-    bool resetScripting = !(m_isDisplayingInitialEmptyDocument && m_frame->document() && m_frame->document()->securityOrigin()->isSecureTransitionTo(url));
+    bool resetScripting = !(m_isDisplayingInitialEmptyDocument && m_frame->document()->securityOrigin()->isSecureTransitionTo(url));
     clear(resetScripting, resetScripting);
     if (resetScripting)
         m_frame->script()->updatePlatformScriptObjects();
-    if (dispatch)
-        dispatchWindowObjectAvailable();
 
     m_needsClear = true;
@@ -940 +931 @@
         document = DOMImplementation::createDocument(m_responseMIMEType, m_frame, m_frame->inViewSourceMode());
     m_frame->setDocument(document);
+
+    if (dispatch)
+        dispatchWindowObjectAvailable();
 
     document->setURL(m_URL);
@@ -1062 +1056 @@
 void FrameLoader::endIfNotLoadingMainResource()
 {
-    if (m_isLoadingMainResource || !m_frame->page())
+    if (m_isLoadingMainResource || !m_frame->page() || !m_frame->document())
         return;
 
@@ -1071 +1065 @@
 
     // make sure nothing's left in there
-    if (m_frame->document()) {
-        write(0, 0, true);
-        m_frame->document()->finishParsing();
+    write(0, 0, true);
+    m_frame->document()->finishParsing();
 #if USE(LOW_BANDWIDTH_DISPLAY)
-        if (m_frame->document()->inLowBandwidthDisplay()) {
-            m_finishedParsingDuringLowBandwidthDisplay = true;
-            switchOutLowBandwidthDisplayIfReady();
-        }
+    if (m_frame->document()->inLowBandwidthDisplay()) {
+        m_finishedParsingDuringLowBandwidthDisplay = true;
+        switchOutLowBandwidthDisplayIfReady();
+    }
 #endif            
-    } else
-        // WebKit partially uses WebCore when loading non-HTML docs.  In these cases doc==nil, but
-        // WebCore is enough involved that we need to checkCompleted() in order for m_bComplete to
-        // become true.  An example is when a subframe is a pure text doc, and that subframe is the
-        // last one to complete.
-        checkCompleted();
 }
 
@@ -1197 +1184 @@
 {
     Document* doc = m_frame->document();
-    if (!doc)
-        return;
         
     HistoryItem* itemToRestore = 0;
@@ -1229 +1214 @@
     // and possibly repaint because :target pseudo class may have been
     // set (see bug 11321).
-    if (!m_URL.hasRef() && !(m_frame->document() && m_frame->document()->cssTarget()))
+    if (!m_URL.hasRef() && !m_frame->document()->cssTarget())
         return;
 
@@ -1267 +1252 @@
 void FrameLoader::loadDone()
 {
-    if (m_frame->document())
-        checkCompleted();
+    checkCompleted();
 }
 
@@ -1283 +1267 @@
 
     // Are we still parsing?
-    if (m_frame->document() && m_frame->document()->parsing())
+    if (m_frame->document()->parsing())
         return;
 
     // Still waiting for images/scripts?
-    if (m_frame->document())
-        if (numRequests(m_frame->document()))
-            return;
+    if (numRequests(m_frame->document()))
+        return;
 
 #if USE(LOW_BANDWIDTH_DISPLAY)
     // as switch will be called, don't complete yet
-    if (m_frame->document() && m_frame->document()->inLowBandwidthDisplay() && m_needToSwitchOutLowBandwidthDisplay)
+    if (m_frame->document()->inLowBandwidthDisplay() && m_needToSwitchOutLowBandwidthDisplay)
         return;
 #endif
@@ -1339 +1322 @@
 void FrameLoader::checkCallImplicitClose()
 {
-    if (m_didCallImplicitClose || !m_frame->document() || m_frame->document()->parsing())
+    if (m_didCallImplicitClose || m_frame->document()->parsing())
         return;
 
@@ -1348 +1331 @@
     m_didCallImplicitClose = true;
     m_wasUnloadEventEmitted = false;
-    if (m_frame->document())
-        m_frame->document()->implicitClose();
+    m_frame->document()->implicitClose();
 }
 
@@ -1419 +1401 @@
         return;
 
-    // Handle a location change of a page with no document as a special case.
-    // This may happen when a frame requests a refresh of another frame.
-    bool duringLoad = !m_frame->document();
-    
-    // If a refresh was scheduled during a load, then stop the current load.
-    // Otherwise when the current load transitions from a provisional to a 
-    // committed state, pending redirects may be cancelled. 
-    if (duringLoad)
-        stopLoading(true);   
-
-    ScheduledRedirection::Type type = duringLoad
-        ? ScheduledRedirection::locationChangeDuringLoad : ScheduledRedirection::locationChange;
+    ScheduledRedirection::Type type = ScheduledRedirection::locationChange;
     scheduleRedirection(new ScheduledRedirection(type, m_URL.string(), m_outgoingReferrer, true, true, wasUserGesture, true));
 }
@@ -1644 +1615 @@
     // We need to update the layout before scrolling, otherwise we could
     // really mess things up if an anchor scroll comes at a bad moment.
-    if (m_frame->document()) {
-        m_frame->document()->updateRendering();
-        // Only do a layout if changes have occurred that make it necessary.
-        if (m_frame->view() && m_frame->contentRenderer() && m_frame->contentRenderer()->needsLayout())
-            m_frame->view()->layout();
-    }
+    m_frame->document()->updateRendering();
+    // Only do a layout if changes have occurred that make it necessary.
+    if (m_frame->view() && m_frame->contentRenderer() && m_frame->contentRenderer()->needsLayout())
+        m_frame->view()->layout();
   
     // Scroll nested layers and frames to reveal the anchor.
@@ -1788 +1757 @@
 String FrameLoader::outgoingOrigin() const
 {
-    if (m_frame->document())
-        return m_frame->document()->securityOrigin()->toString();
-
-    return SecurityOrigin::createEmpty()->toString();
+    return m_frame->document()->securityOrigin()->toString();
 }
 
@@ -1895 +1861 @@
         && !m_containsPlugIns
         && !m_URL.protocolIs("https")
-        && m_frame->document()
         && !m_frame->document()->hasWindowEventListener(eventNames().unloadEvent)
 #if ENABLE(DATABASE)
@@ -2038 +2003 @@
         if (m_URL.protocolIs("https"))
             { PCLOG("   -Frame is HTTPS"); cannotCache = true; }
-        if (!m_frame->document()) {
-            PCLOG("   -There is no Document object");
-            cannotCache = true;
-            break;
-        }
         if (m_frame->document()->hasWindowEventListener(eventNames().unloadEvent))
             { PCLOG("   -Frame has an unload event listener"); cannotCache = true; }
@@ -2084 +2044 @@
 void FrameLoader::updatePolicyBaseURL()
 {
-    if (m_frame->tree()->parent() && m_frame->tree()->parent()->document())
+    if (m_frame->tree()->parent())
         setPolicyBaseURL(m_frame->tree()->parent()->document()->policyBaseURL());
     else
@@ -2092 +2052 @@
 void FrameLoader::setPolicyBaseURL(const KURL& url)
 {
-    if (m_frame->document())
-        m_frame->document()->setPolicyBaseURL(url);
+    m_frame->document()->setPolicyBaseURL(url);
     for (Frame* child = m_frame->tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->loader()->setPolicyBaseURL(url);
@@ -3523 +3482 @@
 {
     stopAllLoaders();
-    if (Document* document = m_frame->document())
-        document->stopActiveDOMObjects();
+    m_frame->document()->stopActiveDOMObjects();
     detachFromParent();
 }
@@ -3881 +3839 @@
         // We don't want to just scroll if a link from within a
         // frameset is trying to reload the frameset into _top.
-        && (!m_frame->document() || !m_frame->document()->isFrameSet());
+        && !m_frame->document()->isFrameSet();
 }
 
@@ -4453 +4411 @@
     ASSERT(document);
     
-    if (document && item->isCurrentDocument(document)) {
+    if (item->isCurrentDocument(document)) {
         LOG(Loading, "WebCoreLoading %s: saving form state to %p", m_frame->tree()->name().string().utf8().data(), item);
         item->setDocumentState(document->formElementsState());

trunk/WebCore/loader/archive/cf/LegacyWebArchive.cpp

@@ -507 +507 @@
              (childFrame = static_cast<HTMLFrameOwnerElement*>(*it)->contentFrame())) {
             RefPtr<LegacyWebArchive> subframeArchive;
-            if (Document* document = childFrame->document())
-                subframeArchive = LegacyWebArchive::create(document);
-            else
-                subframeArchive = create(childFrame);
+            subframeArchive = LegacyWebArchive::create(childFrame->document());
             
             if (subframeArchive)

trunk/WebCore/loader/icon/IconFetcher.cpp

@@ -102 +102 @@
 {
     Document* document = frame->document();
-    if (!document)
-        return 0;
     
     HTMLHeadElement* head = document->head();

trunk/WebCore/loader/icon/IconLoader.cpp

@@ -62 +62 @@
     if (m_resourceLoader)
         return;
-
-    // FIXME: http://bugs.webkit.org/show_bug.cgi?id=10902
-    // Once ResourceHandle will load without a DocLoader, we can remove this check.
-    // A frame may be documentless - one example is a frame containing only a PDF.
-    if (!m_frame->document()) {
-        LOG(IconDatabase, "Documentless-frame - icon won't be loaded");
-        return;
-    }
 
     // Set flag so we can detect the case where the load completes before

trunk/WebCore/page/AccessibilityRenderObject.cpp

@@ -1771 +1771 @@
         if (!frame)
             break;
-        Document* document = frame->document();
-        if (!document)
-            break;
-        renderView = document->renderView();
+        renderView = frame->document()->renderView();
         frameView = static_cast<FrameView*>(widget);
     }

trunk/WebCore/page/Chrome.cpp

@@ -458 +458 @@
 
 #if !PLATFORM(MAC)
-            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-                if (Document* document = frame->document())
-                    document->suspendActiveDOMObjects();
-            }
+            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext())
+                frame->document()->suspendActiveDOMObjects();
 #endif
         }
@@ -479 +477 @@
 
 #if !PLATFORM(MAC)
-            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-                if (Document* document = frame->document())
-                    document->resumeActiveDOMObjects();
-            }
+            for (Frame* frame = page->mainFrame(); frame; frame = frame->tree()->traverseNext())
+                frame->document()->resumeActiveDOMObjects();
 #endif
         }

trunk/WebCore/page/DOMWindow.cpp

@@ -325 +325 @@
 
     Document* document = m_frame->document();
-    if (!document)
-        return 0;
 
     RefPtr<StorageArea> storageArea = page->sessionStorage()->storageArea(document->securityOrigin());
@@ -499 +497 @@
         return;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateRendering();
+    m_frame->document()->updateRendering();
 
     Page* page = m_frame->page();
@@ -516 +511 @@
         return false;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateRendering();
+    m_frame->document()->updateRendering();
 
     Page* page = m_frame->page();
@@ -533 +525 @@
         return String();
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateRendering();
+    m_frame->document()->updateRendering();
 
     Page* page = m_frame->page();
@@ -644 +633 @@
         return 0;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateLayoutIgnorePendingStylesheets();
+    m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
     return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor());
@@ -661 +647 @@
         return 0;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateLayoutIgnorePendingStylesheets();
+    m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
     return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor());
@@ -798 +781 @@
 
     Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (!doc)
-        return 0;
 
     if (!pseudoElt.isEmpty())
@@ -826 +806 @@
 
     Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (!doc)
-        return 0;
 
     Settings* settings = m_frame->settings();
@@ -843 +820 @@
         return;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateLayoutIgnorePendingStylesheets();
+    m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
     FrameView* view = m_frame->view();
@@ -860 +834 @@
         return;
 
-    Document* doc = m_frame->document();
-    ASSERT(doc);
-    if (doc)
-        doc->updateLayoutIgnorePendingStylesheets();
+    m_frame->document()->updateLayoutIgnorePendingStylesheets();
 
     FrameView* view = m_frame->view();

trunk/WebCore/page/EventHandler.cpp

@@ -686 +686 @@
 void EventHandler::allowDHTMLDrag(bool& flagDHTML, bool& flagUA) const
 {
-    if (!m_frame || !m_frame->document()) {
+    if (!m_frame) {
         flagDHTML = false;
         flagUA = false;
@@ -792 +792 @@
 bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity)
 {
-    if (!m_frame->document())
-        return false;
-    
     Node* node = m_frame->document()->focusedNode();
     if (!node)
@@ -1003 +1000 @@
 bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
 {
-    if (!m_frame->document())
-        return false;
-
     RefPtr<FrameView> protector(m_frame->view());
 
@@ -1127 +1121 @@
 bool EventHandler::handleMouseDoubleClickEvent(const PlatformMouseEvent& mouseEvent)
 {
-    if (!m_frame->document())
-        return false;
-
     RefPtr<FrameView> protector(m_frame->view());
 
@@ -1186 +1177 @@
     // builds, if it happens.
     ASSERT(m_frame);
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return false;
 
@@ -1284 +1275 @@
 bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
 {
-    if (!m_frame->document())
-        return false;
-
     RefPtr<FrameView> protector(m_frame->view());
 
@@ -1355 +1343 @@
 {
     bool accept = false;
-
-    if (!m_frame->document())
-        return false;
 
     if (!m_frame->view())
@@ -1601 +1586 @@
 {
     Document* doc = m_frame->document();
-    if (!doc)
-        return false;
 
     RenderObject* docRenderer = doc->renderer();
@@ -1653 +1636 @@
     Document* doc = m_frame->document();
     FrameView* v = m_frame->view();
-    if (!doc || !v)
+    if (!v)
         return false;
     
@@ -2238 +2221 @@
 void EventHandler::capsLockStateMayHaveChanged()
 {
-    if (Document* d = m_frame->document())
-        if (Node* node = d->focusedNode())
-            if (RenderObject* r = node->renderer())
-                r->capsLockStateMayHaveChanged();
+    Document* d = m_frame->document();
+    if (Node* node = d->focusedNode())
+        if (RenderObject* r = node->renderer())
+            r->capsLockStateMayHaveChanged();
 }
 
@@ -2273 +2256 @@
 void EventHandler::sendResizeEvent()
 {
-    if (Document* doc = m_frame->document())
-        doc->dispatchWindowEvent(eventNames().resizeEvent, false, false);
+    m_frame->document()->dispatchWindowEvent(eventNames().resizeEvent, false, false);
 }
 
@@ -2283 +2265 @@
         return;
     v->setWasScrolledByUser(true);
-    Document* doc = m_frame->document();
-    if (!doc)
-        return;
-    doc->dispatchEventForType(eventNames().scrollEvent, true, false);
+    m_frame->document()->dispatchEventForType(eventNames().scrollEvent, true, false);
 }
 

trunk/WebCore/page/FocusController.cpp

@@ -91 +91 @@
 
         Document* document = owner->contentFrame()->document();
-        if (!document)
-            break;
 
         node = (direction == FocusDirectionForward)
@@ -116 +114 @@
     ASSERT(frame);
     Document* document = frame->document();
-    if (!document)
-        return false;
 
     Node* node = (direction == FocusDirectionForward)
@@ -130 +126 @@
 
         Document* parentDocument = parentFrame->document();
-        if (!parentDocument)
-            break;
 
         HTMLFrameOwnerElement* owner = frame->ownerElement();
@@ -156 +150 @@
 
         // Chrome doesn't want focus, so we should wrap focus.
-        if (Document* d = m_page->mainFrame()->document())
-            node = (direction == FocusDirectionForward)
-                ? d->nextFocusableNode(0, event)
-                : d->previousFocusableNode(0, event);
+        Document* d = m_page->mainFrame()->document();
+        node = (direction == FocusDirectionForward)
+            ? d->nextFocusableNode(0, event)
+            : d->previousFocusableNode(0, event);
 
         node = deepFocusableNode(direction, node, event);

trunk/WebCore/page/Frame.cpp

@@ -567 +567 @@
 void Frame::setFocusedNodeIfNeeded()
 {
-    if (!document() || selection()->isNone() || !selection()->isFocusedAndActive())
+    if (selection()->isNone() || !selection()->isFocusedAndActive())
         return;
 
@@ -697 +697 @@
         return false;
 #if ENABLE(SVG)
-    if (m_doc && m_doc->isSVGDocument())
+    if (m_doc->isSVGDocument())
         return false;
 #endif
@@ -708 +708 @@
         return false;
 #if ENABLE(SVG)
-    if (m_doc && m_doc->isSVGDocument())
+    if (m_doc->isSVGDocument())
         return false;
 #endif
@@ -722 +722 @@
     // SVG doesn't care if the zoom factor is text only.  It will always apply a 
     // zoom to the whole SVG.
-    if (m_doc && m_doc->isSVGDocument()) {
+    if (m_doc->isSVGDocument()) {
         if (!static_cast<SVGDocument*>(m_doc.get())->zoomAndPanEnabled())
             return;
@@ -736 +736 @@
     m_page->settings()->setZoomsTextOnly(isTextOnly);
 
-    if (m_doc)
-        m_doc->recalcStyle(Node::Force);
+    m_doc->recalcStyle(Node::Force);
 
     for (Frame* child = tree()->firstChild(); child; child = child->tree()->nextSibling())
         child->setZoomFactor(m_zoomFactor, isTextOnly);
 
-    if (m_doc && m_doc->renderer() && m_doc->renderer()->needsLayout() && view()->didFirstLayout())
+    if (m_doc->renderer() && m_doc->renderer()->needsLayout() && view()->didFirstLayout())
         view()->layout();
 }
@@ -748 +747 @@
 void Frame::setPrinting(bool printing, float minPageWidth, float maxPageWidth, bool adjustViewSize)
 {
-    if (!m_doc)
-        return;
-
     m_doc->setPrinting(printing);
     view()->setMediaType(printing ? "print" : "screen");
@@ -809 +805 @@
     // "reapplyStyles". We should probably eventually move it into its own
     // method.
-    if (m_doc)
-        m_doc->docLoader()->setAutoLoadImages(m_page && m_page->settings()->loadsImagesAutomatically());
+    m_doc->docLoader()->setAutoLoadImages(m_page && m_page->settings()->loadsImagesAutomatically());
         
 #if FRAME_LOADS_USER_STYLESHEET
@@ -824 +819 @@
     // But we had problems when this code was removed. Details are in
     // <http://bugs.webkit.org/show_bug.cgi?id=8079>.
-    if (m_doc)
-        m_doc->updateStyleSelector();
+    m_doc->updateStyleSelector();
 }
 
@@ -848 +842 @@
     if (m_editor.clientIsEditable())
         return true;
-    if (!m_doc)
-        return false;
     return m_doc->inDesignMode();
 }
@@ -918 +910 @@
     RefPtr<CSSMutableStyleDeclaration> blockStyle = mutableStyle->copyBlockProperties();
     blockStyle->diff(mutableStyle.get());
-    if (document() && blockStyle->length() > 0)
+    if (blockStyle->length() > 0)
         applyCommand(ApplyStyleCommand::create(document(), blockStyle.get(), editingAction));
     
@@ -946 +938 @@
 {
     nodeToRemove = 0;
-
-    if (!document())
-        return 0;
 
     if (selection()->isNone())
@@ -1033 +1022 @@
 void Frame::applyEditingStyleToBodyElement() const
 {
-    if (!m_doc)
-        return;
-        
     RefPtr<NodeList> list = m_doc->getElementsByTagName("body");
     unsigned len = list->length();
@@ -1045 +1031 @@
 void Frame::removeEditingStyleFromBodyElement() const
 {
-    if (!m_doc)
-        return;
-        
     RefPtr<NodeList> list = m_doc->getElementsByTagName("body");
     unsigned len = list->length();
@@ -1128 +1111 @@
 {
     Document* doc = document();
-    if (!doc)
-        return 0;
     RenderObject* object = doc->renderer();
     if (!object)
@@ -1327 +1308 @@
     nodeToRemove = 0;
     
-    if (!document())
-        return 0;
     if (selection()->isNone())
         return 0;
@@ -1365 +1344 @@
     // entire WebView is editable or designMode is on for this document).
     Document *doc = document();
-    if (!doc || !selection()->isNone() || !isContentEditable())
+    if (!selection()->isNone() || !isContentEditable())
         return;
         
@@ -1388 +1367 @@
 bool Frame::findString(const String& target, bool forward, bool caseFlag, bool wrapFlag, bool startInSelection)
 {
-    if (target.isEmpty() || !document())
+    if (target.isEmpty())
         return false;
     
@@ -1474 +1453 @@
 unsigned Frame::markAllMatchesForText(const String& target, bool caseFlag, unsigned limit)
 {
-    if (target.isEmpty() || !document())
+    if (target.isEmpty())
         return 0;
     
@@ -1517 +1496 @@
     // each text match.
     Document* doc = document();
-    if (doc && m_view && contentRenderer()) {
+    if (m_view && contentRenderer()) {
         doc->updateLayout(); // Ensure layout is up to date.
         IntRect visibleRect = m_view->visibleContentRect();
@@ -1537 +1516 @@
 void Frame::setMarkedTextMatchesAreHighlighted(bool flag)
 {
-    if (flag == m_highlightTextMatches || !document())
+    if (flag == m_highlightTextMatches)
         return;
     
@@ -1617 +1596 @@
 String Frame::documentTypeString() const
 {
-    if (Document* doc = document()) {
-        if (DocumentType* doctype = doc->doctype())
-            return createMarkup(doctype);
-    }
+    if (DocumentType* doctype = document()->doctype())
+        return createMarkup(doctype);
 
     return String();
@@ -1654 +1631 @@
 
     RefPtr<Document> doc = document();
-    if (!doc)
-        return true;
     HTMLElement* body = doc->body();
     if (!body)
@@ -1664 +1639 @@
     doc->handleWindowEvent(beforeUnloadEvent.get(), false);
 
-    if (!beforeUnloadEvent->defaultPrevented() && doc)
+    if (!beforeUnloadEvent->defaultPrevented())
         doc->defaultEventHandler(beforeUnloadEvent.get());
     if (beforeUnloadEvent->result().isNull())
@@ -1685 +1660 @@
 void Frame::respondToChangedSelection(const VisibleSelection& oldSelection, bool closeTyping)
 {
-    if (document()) {
-        bool isContinuousSpellCheckingEnabled = editor()->isContinuousSpellCheckingEnabled();
-        bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled && editor()->isGrammarCheckingEnabled();
-        if (isContinuousSpellCheckingEnabled) {
-            VisibleSelection newAdjacentWords;
-            VisibleSelection newSelectedSentence;
-            if (selection()->selection().isContentEditable()) {
-                VisiblePosition newStart(selection()->selection().visibleStart());
-                newAdjacentWords = VisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
-                if (isContinuousGrammarCheckingEnabled)
-                    newSelectedSentence = VisibleSelection(startOfSentence(newStart), endOfSentence(newStart));
-            }
-
-            // When typing we check spelling elsewhere, so don't redo it here.
-            // If this is a change in selection resulting from a delete operation,
-            // oldSelection may no longer be in the document.
-            if (closeTyping && oldSelection.isContentEditable() && oldSelection.start().node() && oldSelection.start().node()->inDocument()) {
-                VisiblePosition oldStart(oldSelection.visibleStart());
-                VisibleSelection oldAdjacentWords = VisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary));   
-                if (oldAdjacentWords != newAdjacentWords) {
-                    editor()->markMisspellings(oldAdjacentWords);
-                    if (isContinuousGrammarCheckingEnabled) {
-                        VisibleSelection oldSelectedSentence = VisibleSelection(startOfSentence(oldStart), endOfSentence(oldStart));   
-                        if (oldSelectedSentence != newSelectedSentence)
-                            editor()->markBadGrammar(oldSelectedSentence);
-                    }
+    bool isContinuousSpellCheckingEnabled = editor()->isContinuousSpellCheckingEnabled();
+    bool isContinuousGrammarCheckingEnabled = isContinuousSpellCheckingEnabled && editor()->isGrammarCheckingEnabled();
+    if (isContinuousSpellCheckingEnabled) {
+        VisibleSelection newAdjacentWords;
+        VisibleSelection newSelectedSentence;
+        if (selection()->selection().isContentEditable()) {
+            VisiblePosition newStart(selection()->selection().visibleStart());
+            newAdjacentWords = VisibleSelection(startOfWord(newStart, LeftWordIfOnBoundary), endOfWord(newStart, RightWordIfOnBoundary));
+            if (isContinuousGrammarCheckingEnabled)
+                newSelectedSentence = VisibleSelection(startOfSentence(newStart), endOfSentence(newStart));
+        }
+
+        // When typing we check spelling elsewhere, so don't redo it here.
+        // If this is a change in selection resulting from a delete operation,
+        // oldSelection may no longer be in the document.
+        if (closeTyping && oldSelection.isContentEditable() && oldSelection.start().node() && oldSelection.start().node()->inDocument()) {
+            VisiblePosition oldStart(oldSelection.visibleStart());
+            VisibleSelection oldAdjacentWords = VisibleSelection(startOfWord(oldStart, LeftWordIfOnBoundary), endOfWord(oldStart, RightWordIfOnBoundary));   
+            if (oldAdjacentWords != newAdjacentWords) {
+                editor()->markMisspellings(oldAdjacentWords);
+                if (isContinuousGrammarCheckingEnabled) {
+                    VisibleSelection oldSelectedSentence = VisibleSelection(startOfSentence(oldStart), endOfSentence(oldStart));   
+                    if (oldSelectedSentence != newSelectedSentence)
+                        editor()->markBadGrammar(oldSelectedSentence);
                 }
             }
-
-            // This only erases markers that are in the first unit (word or sentence) of the selection.
-            // Perhaps peculiar, but it matches AppKit.
-            if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
-                document()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
-            if (RefPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())
-                document()->removeMarkers(sentenceRange.get(), DocumentMarker::Grammar);
-        }
-
-        // When continuous spell checking is off, existing markers disappear after the selection changes.
-        if (!isContinuousSpellCheckingEnabled)
-            document()->removeMarkers(DocumentMarker::Spelling);
-        if (!isContinuousGrammarCheckingEnabled)
-            document()->removeMarkers(DocumentMarker::Grammar);
-    }
+        }
+
+        // This only erases markers that are in the first unit (word or sentence) of the selection.
+        // Perhaps peculiar, but it matches AppKit.
+        if (RefPtr<Range> wordRange = newAdjacentWords.toNormalizedRange())
+            document()->removeMarkers(wordRange.get(), DocumentMarker::Spelling);
+        if (RefPtr<Range> sentenceRange = newSelectedSentence.toNormalizedRange())
+            document()->removeMarkers(sentenceRange.get(), DocumentMarker::Grammar);
+    }
+
+    // When continuous spell checking is off, existing markers disappear after the selection changes.
+    if (!isContinuousSpellCheckingEnabled)
+        document()->removeMarkers(DocumentMarker::Spelling);
+    if (!isContinuousGrammarCheckingEnabled)
+        document()->removeMarkers(DocumentMarker::Grammar);
 
     editor()->respondToChangedSelection(oldSelection);

trunk/WebCore/page/FrameView.cpp

@@ -133 +133 @@
 
     if (m_frame) {
-        ASSERT(m_frame->view() != this || !m_frame->document() || !m_frame->contentRenderer());
+        ASSERT(m_frame->view() != this || !m_frame->contentRenderer());
         RenderPart* renderer = m_frame->ownerRenderer();
         if (renderer && renderer->widget() == this)
@@ -287 +287 @@
     // FIXME: We need to update the scrollbar dynamically as documents change (or as doc elements and bodies get discovered that have custom styles).
     Document* doc = m_frame->document();
-    if (!doc)
-        return ScrollView::createScrollbar(orientation);
 
     // Try the <body> element first as a scrollbar source.
@@ -444 +442 @@
 
     Document* document = m_frame->document();
-    if (!document) {
-        // FIXME: Should we set m_size.height here too?
-        m_size.setWidth(layoutWidth());
-        return;
-    }
 
     m_layoutSchedulingEnabled = false;
@@ -766 +759 @@
 {
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (m_frame->document() && !m_frame->document()->ownerElement())
+    if (!m_frame->document()->ownerElement())
         printf("Layout timer fired at %d\n", m_frame->document()->elapsedTime());
 #endif
@@ -774 +767 @@
 void FrameView::scheduleRelayout()
 {
-    ASSERT(!m_frame->document() || !m_frame->document()->inPageCache());
+    ASSERT(!m_frame->document()->inPageCache());
     ASSERT(m_frame->view() == this);
 
@@ -785 +778 @@
     if (!needsLayout())
         return;
-    if (!m_frame->document() || !m_frame->document()->shouldScheduleLayout())
+    if (!m_frame->document()->shouldScheduleLayout())
         return;
 
@@ -866 +859 @@
         || (root && root->needsLayout())
         || m_layoutRoot
-        || (document && document->hasChangedChild()) // can occur when using WebKit ObjC interface
+        || document->hasChangedChild() // can occur when using WebKit ObjC interface
         || m_frame->needsReapplyStyles();
 }
@@ -883 +876 @@
 
 #ifdef INSTRUMENT_LAYOUT_SCHEDULING
-    if (m_frame->document() && !m_frame->document()->ownerElement())
+    if (!m_frame->document()->ownerElement())
         printf("Layout timer unscheduled at %d\n", m_frame->document()->elapsedTime());
 #endif
@@ -1066 +1059 @@
     // 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->document()->ownerElement())
         return clipRect;
 
@@ -1192 +1185 @@
     
     Document* document = frame()->document();
-    if (!document)
-        return;
 
 #ifndef NDEBUG
     bool fillWithRed;
-    if (document || document->printing())
+    if (document->printing())
         fillWithRed = false; // Printing, don't fill with red (can't remember why).
     else if (document->ownerElement())

trunk/WebCore/page/Geolocation.cpp

@@ -63 +63 @@
 {
     m_service->stopUpdating();
-    if (m_frame->document())
-        m_frame->document()->setUsingGeolocation(false);
+    m_frame->document()->setUsingGeolocation(false);
     m_frame = 0;
 }

trunk/WebCore/page/Page.cpp

@@ -94 +94 @@
         Document* document = frames[i]->document();
         
-        if (!document)
-            continue;
-
         // If the document does not have a body the event should be dispatched to the document
         Node* eventTarget = document->body();
@@ -159 +156 @@
     
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        if (frame->document())
-            frame->document()->documentWillBecomeInactive();
+        frame->document()->documentWillBecomeInactive();
         frame->pageDestroyed();
     }
@@ -359 +355 @@
     Frame* frame = mainFrame();
     do {
-        if (Document* document = frame->document())
-            document->removeMarkers(DocumentMarker::TextMatch);
+        frame->document()->removeMarkers(DocumentMarker::TextMatch);
         frame = incrementFrame(frame, true, false);
     } while (frame);
@@ -405 +400 @@
     m_mediaVolume = volume;
     for (Frame* frame = mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        if (frame->document())
-            frame->document()->mediaVolumeDidChange();
+        frame->document()->mediaVolumeDidChange();
     }
 }

trunk/WebCore/page/animation/AnimationController.cpp

@@ -148 +148 @@
     m_nodeChangesToDispatch.clear();
     
-    if (m_frame && m_frame->document())
+    if (m_frame)
         m_frame->document()->updateRendering();
 }

trunk/WebCore/page/mac/EventHandlerMac.mm

@@ -84 +84 @@
             PlatformKeyboardEvent platformEvent(event);
             platformEvent.disambiguateKeyDownEvent(PlatformKeyboardEvent::RawKeyDown);
-            return KeyboardEvent::create(platformEvent, m_frame->document() ? m_frame->document()->defaultView() : 0);
+            return KeyboardEvent::create(platformEvent, m_frame->document()->defaultView());
         }
         case NSKeyUp:
-            return KeyboardEvent::create(event, m_frame->document() ? m_frame->document()->defaultView() : 0);
+            return KeyboardEvent::create(event, m_frame->document()->defaultView());
         default:
             return 0;
@@ -141 +141 @@
     
     Document* document = m_frame->document();
-    if (!document)
-        return false;
 
     // RSS view needs arrow key keypress events.

trunk/WebCore/page/mac/FrameMac.mm

@@ -491 +491 @@
 {
     Document* doc = document();
-    if (!doc)
-        return nil;
 
     const Vector<DashboardRegionValue>& regions = doc->dashboardRegions();
@@ -538 +536 @@
     delete m_userStyleSheetLoader;
     m_userStyleSheetLoader = 0;
-    if (m_doc && m_doc->docLoader())
+    if (m_doc->docLoader())
         m_userStyleSheetLoader = new UserStyleSheetLoader(m_doc, url.string());
 }
@@ -546 +544 @@
     delete m_userStyleSheetLoader;
     m_userStyleSheetLoader = 0;
-    if (m_doc)
-        m_doc->setUserStyleSheet(styleSheet);
+    m_doc->setUserStyleSheet(styleSheet);
 }
 

trunk/WebCore/storage/LocalStorageArea.cpp

@@ -220 +220 @@
     for (HashSet<Page*>::const_iterator it = pages.begin(); it != end; ++it) {
         for (Frame* frame = (*it)->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-            if (Document* document = frame->document())
-                if (document->securityOrigin()->equal(securityOrigin()))
-                    frames.append(frame);
+            if (frame->document()->securityOrigin()->equal(securityOrigin()))
+                frames.append(frame);
         }
     }

trunk/WebCore/storage/SessionStorageArea.cpp

@@ -76 +76 @@
     Vector<RefPtr<Frame> > frames;
     for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
-        if (Document* document = frame->document())
-            if (document->securityOrigin()->equal(securityOrigin()))
-                frames.append(frame);
+        if (frame->document()->securityOrigin()->equal(securityOrigin()))
+            frames.append(frame);
     }
         

trunk/WebCore/svg/graphics/SVGImage.cpp

@@ -104 +104 @@
         return;
 
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return;
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();
@@ -115 +115 @@
 bool SVGImage::usesContainerSize() const
 {
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return false;
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();
@@ -126 +126 @@
 IntSize SVGImage::size() const
 {
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return IntSize();
     
@@ -152 +152 @@
 bool SVGImage::hasRelativeWidth() const
 {
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return false;
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();
@@ -163 +163 @@
 bool SVGImage::hasRelativeHeight() const
 {
-    if (!m_frame || !m_frame->document())
+    if (!m_frame)
         return false;
     SVGSVGElement* rootElement = static_cast<SVGDocument*>(m_frame->document())->rootElement();