Changeset 104552 in webkit

Timestamp:

Jan 10, 2012 4:19:42 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Add NULL checks to setting access obtained on frame and document.
​https://bugs.webkit.org/show_bug.cgi?id=72002

Patch by Grzegorz Czajkowski <​g.czajkowski@samsung.com> on 2012-01-10
Reviewed by Andreas Kling.

Adds NULL checks to setting object where it's required.
Generally WebCore checks NULL which may be returned from setting object obtained
on frame or document but in some cases these are skipped. These checks are not
needed to setting's access on page object.

• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::shouldAccelerate):

• loader/DocumentLoader.cpp:

(WebCore::DocumentLoader::scheduleArchiveLoad):

• loader/SubframeLoader.cpp:

(WebCore::SubframeLoader::requestPlugin):

• loader/appcache/ApplicationCacheGroup.cpp:

(WebCore::ApplicationCacheGroup::selectCache):
(WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):

• page/DragController.cpp:

(WebCore::DragController::draggableNode):

• page/EventHandler.cpp:

(WebCore::EventHandler::handleMouseReleaseEvent):

• page/FocusController.cpp:

(WebCore::FocusController::advanceFocusInDocumentOrder):

• rendering/RenderFrameSet.cpp:

(WebCore::RenderFrameSet::flattenFrameSet):

• rendering/RenderIFrame.cpp:

(WebCore::RenderIFrame::flattenFrame):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::updateBacking):

• rendering/RenderText.cpp:

(WebCore::SecureTextTimer::restartWithNewText):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLCanvasElement.cpp (modified) (2 diffs)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/SubframeLoader.cpp (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (3 diffs)
• page/DragController.cpp (modified) (1 diff)
• page/EventHandler.cpp (modified) (1 diff)
• page/FocusController.cpp (modified) (1 diff)
• rendering/RenderFrameSet.cpp (modified) (1 diff)
• rendering/RenderIFrame.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-10  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        Add NULL checks to setting access obtained on frame and document.
+        https://bugs.webkit.org/show_bug.cgi?id=72002
+
+        Reviewed by Andreas Kling.
+
+        Adds NULL checks to setting object where it's required.
+        Generally WebCore checks NULL which may be returned from setting object obtained
+        on frame or document but in some cases these are skipped. These checks are not
+        needed to setting's access on page object.
+
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::shouldAccelerate):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::scheduleArchiveLoad):
+        * loader/SubframeLoader.cpp:
+        (WebCore::SubframeLoader::requestPlugin):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::selectCache):
+        (WebCore::ApplicationCacheGroup::selectCacheWithoutManifestURL):
+        * page/DragController.cpp:
+        (WebCore::DragController::draggableNode):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleMouseReleaseEvent):
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocusInDocumentOrder):
+        * rendering/RenderFrameSet.cpp:
+        (WebCore::RenderFrameSet::flattenFrameSet):
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::flattenFrame):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::updateBacking):
+        * rendering/RenderText.cpp:
+        (WebCore::SecureTextTimer::restartWithNewText):
+
 2012-01-10  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -424 +424 @@
 #if USE(IOSURFACE_CANVAS_BACKING_STORE)
     UNUSED_PARAM(size);
-    return document()->settings()->canvasUsesAcceleratedDrawing();
+    return document()->settings() && document()->settings()->canvasUsesAcceleratedDrawing();
 #elif ENABLE(ACCELERATED_2D_CANVAS)
     if (m_context && !m_context->is2d())
@@ -430 +430 @@
 
     Settings* settings = document()->settings();
-    if (!settings->accelerated2dCanvasEnabled())
+    if (!settings || !settings->accelerated2dCanvasEnabled())
         return false;
 

trunk/Source/WebCore/loader/DocumentLoader.cpp

@@ -641 +641 @@
     case Archive::WebArchive:
         // WebArchiveDebugMode means we fail loads instead of trying to fetch them from the network if they're not in the archive.
-        return m_frame->settings()->webArchiveDebugModeEnabled() && ArchiveFactory::isArchiveMimeType(responseMIMEType());
+        return m_frame->settings() && m_frame->settings()->webArchiveDebugModeEnabled() && ArchiveFactory::isArchiveMimeType(responseMIMEType());
 #endif
 #if ENABLE(MHTML)

trunk/Source/WebCore/loader/SubframeLoader.cpp

@@ -110 +110 @@
          // permitted, rather than WebKit.
          && !MIMETypeRegistry::isApplicationPluginMIMEType(mimeType))
-        || (!settings->isJavaEnabled() && MIMETypeRegistry::isJavaAppletMIMEType(mimeType)))
+        || ((!settings || !settings->isJavaEnabled()) && MIMETypeRegistry::isJavaAppletMIMEType(mimeType)))
         return false;
 

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -139 +139 @@
     ASSERT(frame && frame->page());
     
-    if (!frame->settings()->offlineWebApplicationCacheEnabled())
+    if (!frame->settings() || !frame->settings()->offlineWebApplicationCacheEnabled())
         return;
     
@@ -194 +194 @@
 
     // Don't change anything on disk if private browsing is enabled.
-    if (!frame->settings() || frame->settings()->privateBrowsingEnabled()) {
+    if (frame->settings()->privateBrowsingEnabled()) {
         postListenerTask(ApplicationCacheHost::CHECKING_EVENT, documentLoader);
         postListenerTask(ApplicationCacheHost::ERROR_EVENT, documentLoader);
@@ -212 +212 @@
 void ApplicationCacheGroup::selectCacheWithoutManifestURL(Frame* frame)
 {
-    if (!frame->settings()->offlineWebApplicationCacheEnabled())
+    if (!frame->settings() || !frame->settings()->offlineWebApplicationCacheEnabled())
         return;
 

trunk/Source/WebCore/page/DragController.cpp

@@ -627 +627 @@
                 if ((m_dragSourceAction & DragSourceActionImage)
                     && node->hasTagName(HTMLNames::imgTag)
+                    && src->settings()
                     && src->settings()->loadsImagesAutomatically()) {
                     state.m_dragType = static_cast<DragSourceAction>(state.m_dragType | DragSourceActionImage);

trunk/Source/WebCore/page/EventHandler.cpp

@@ -772 +772 @@
         VisibleSelection newSelection;
         Node* node = targetNode(event);
-        bool caretBrowsing = m_frame->settings()->caretBrowsingEnabled();
+        bool caretBrowsing = m_frame->settings() && m_frame->settings()->caretBrowsingEnabled();
         if (node && (caretBrowsing || node->rendererIsEditable()) && node->renderer()) {
             VisiblePosition pos = node->renderer()->positionForPoint(event.localPoint());

trunk/Source/WebCore/page/FocusController.cpp

@@ -245 +245 @@
     Node* currentNode = document->focusedNode();
     // FIXME: Not quite correct when it comes to focus transitions leaving/entering the WebView itself
-    bool caretBrowsing = focusedOrMainFrame()->settings()->caretBrowsingEnabled();
+    bool caretBrowsing = frame->settings() && frame->settings()->caretBrowsingEnabled();
 
     if (caretBrowsing && !currentNode)

trunk/Source/WebCore/rendering/RenderFrameSet.cpp

@@ -663 +663 @@
 bool RenderFrameSet::flattenFrameSet() const
 {
-    return frame() && frame()->settings()->frameFlatteningEnabled();
+    return frame() && frame()->settings() && frame()->settings()->frameFlatteningEnabled();
 }
 

trunk/Source/WebCore/rendering/RenderIFrame.cpp

@@ -96 +96 @@
 
     Frame* frame = element->document()->frame();
-    bool enabled = frame && frame->settings()->frameFlatteningEnabled();
+    bool enabled = frame && frame->settings() && frame->settings()->frameFlatteningEnabled();
 
     if (!enabled || !frame->page())

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -369 +369 @@
 
 #if PLATFORM(MAC) && USE(CA)
-            if (m_renderView->document()->settings()->acceleratedDrawingEnabled())
+            Settings* settings = m_renderView->document()->settings();
+            if (settings && settings->acceleratedDrawingEnabled())
                 layer->backing()->graphicsLayer()->setAcceleratesDrawing(true);
             else if (layer->renderer()->isCanvas()) {

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -69 +69 @@
     {
         m_lastTypedCharacterOffset = lastTypedCharacterOffset;
-        startOneShot(m_renderText->document()->settings()->passwordEchoDurationInSeconds());
+        if (Settings* settings = m_renderText->document()->settings())
+            startOneShot(settings->passwordEchoDurationInSeconds());
     }
     void invalidate() { m_lastTypedCharacterOffset = -1; }