<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20723] trunk/WebCore</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20723">20723</a></dd>
<dt>Author</dt> <dd>ggaren</dd>
<dt>Date</dt> <dd>2007-04-05 10:48:23 -0700 (Thu, 05 Apr 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre> Reviewed by Beth Dakin.
Some clean-up while fixing <rdar://problem/5112273> REGRESSION(TOT):
Reproducible crash loading an old version of amazon.com as a web archive
Removed superfluous document NULL checks. (Node::document() never returns
NULL, and it asserts as much.)
Removed duplicate implementation of displayString.
Layout tests pass.
* bindings/objc/DOMInternal.h:
* bindings/objc/DOMInternal.mm:
* html/HTMLGenericFormElement.cpp:
(WebCore::HTMLGenericFormElement::supportsFocus):
* html/HTMLPlugInElement.cpp:
(WebCore::HTMLPlugInElement::createNPObject):
* platform/ContextMenu.cpp:
(WebCore::ContextMenu::checkOrEnableIfNeeded):
* rendering/HitTestResult.cpp:
(WebCore::displayString):
* rendering/HitTestResult.h:
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateHoverActiveState):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorebindingsobjcDOMInternalh">trunk/WebCore/bindings/objc/DOMInternal.h</a></li>
<li><a href="#trunkWebCorebindingsobjcDOMInternalmm">trunk/WebCore/bindings/objc/DOMInternal.mm</a></li>
<li><a href="#trunkWebCorehtmlHTMLGenericFormElementcpp">trunk/WebCore/html/HTMLGenericFormElement.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLPlugInElementcpp">trunk/WebCore/html/HTMLPlugInElement.cpp</a></li>
<li><a href="#trunkWebCoreplatformContextMenucpp">trunk/WebCore/platform/ContextMenu.cpp</a></li>
<li><a href="#trunkWebCorerenderingHitTestResultcpp">trunk/WebCore/rendering/HitTestResult.cpp</a></li>
<li><a href="#trunkWebCorerenderingHitTestResulth">trunk/WebCore/rendering/HitTestResult.h</a></li>
<li><a href="#trunkWebCorerenderingRenderLayercpp">trunk/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/ChangeLog 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2007-04-05 Geoffrey Garen <ggaren@apple.com>
+
+ Reviewed by Beth Dakin.
+
+ Some clean-up while fixing <rdar://problem/5112273> REGRESSION(TOT):
+ Reproducible crash loading an old version of amazon.com as a web archive
+
+ Removed superfluous document NULL checks. (Node::document() never returns
+ NULL, and it asserts as much.)
+
+ Removed duplicate implementation of displayString.
+
+ Layout tests pass.
+
+ * bindings/objc/DOMInternal.h:
+ * bindings/objc/DOMInternal.mm:
+ * html/HTMLGenericFormElement.cpp:
+ (WebCore::HTMLGenericFormElement::supportsFocus):
+ * html/HTMLPlugInElement.cpp:
+ (WebCore::HTMLPlugInElement::createNPObject):
+ * platform/ContextMenu.cpp:
+ (WebCore::ContextMenu::checkOrEnableIfNeeded):
+ * rendering/HitTestResult.cpp:
+ (WebCore::displayString):
+ * rendering/HitTestResult.h:
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateHoverActiveState):
+
</ins><span class="cx"> 2007-04-05 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Reviewed by Adam.
</span></span></pre></div>
<a id="trunkWebCorebindingsobjcDOMInternalh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/DOMInternal.h (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/DOMInternal.h 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/bindings/objc/DOMInternal.h 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -30,12 +30,14 @@
</span><span class="cx"> #import "Color.h"
</span><span class="cx"> #import "DOMObject.h"
</span><span class="cx"> #import "DOMRGBColor.h"
</span><ins>+#import "HitTestResult.h"
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(XPATH)
</span><ins>+#import "DOMXPathExpressionInternal.h"
</ins><span class="cx"> #import "DOMXPathNSResolver.h"
</span><ins>+#import "DOMXPathResultInternal.h"
</ins><span class="cx"> #endif // ENABLE(XPATH)
</span><span class="cx">
</span><del>-
</del><span class="cx"> // Auto-generated internal interfaces
</span><span class="cx"> #import "DOMAbstractViewInternal.h"
</span><span class="cx"> #import "DOMAttrInternal.h"
</span><span class="lines">@@ -266,11 +268,6 @@
</span><span class="cx"> #import "DOMSVGZoomEventInternal.h"
</span><span class="cx"> #endif // ENABLE(SVG)
</span><span class="cx">
</span><del>-#if ENABLE(XPATH)
-#import "DOMXPathExpressionInternal.h"
-#import "DOMXPathResultInternal.h"
-#endif // ENABLE(XPATH)
-
</del><span class="cx"> namespace KJS {
</span><span class="cx"> class JSObject;
</span><span class="cx">
</span><span class="lines">@@ -345,6 +342,4 @@
</span><span class="cx"> addDOMWrapper(wrapper, reinterpret_cast<DOMObjectInternal*>(impl));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSString* displayString(const String&, const Node*);
-
</del><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkWebCorebindingsobjcDOMInternalmm"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/bindings/objc/DOMInternal.mm (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/bindings/objc/DOMInternal.mm 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/bindings/objc/DOMInternal.mm 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -124,19 +124,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><del>-
-namespace WebCore {
-
-NSString* displayString(const String& string, const Node* node)
-{
- if (!node)
- return string;
- Document* document = node->document();
- if (!document)
- return string;
- String copy(string);
- copy.replace('\\', document->backslashAsCurrencySymbol());
- return copy;
-}
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkWebCorehtmlHTMLGenericFormElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLGenericFormElement.cpp (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLGenericFormElement.cpp 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/html/HTMLGenericFormElement.cpp 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLGenericFormElement::supportsFocus() const
</span><span class="cx"> {
</span><del>- return isFocusable() || (!disabled() && document() && !document()->haveStylesheetsLoaded());
</del><ins>+ return isFocusable() || (!disabled() && !document()->haveStylesheetsLoaded());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLPlugInElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLPlugInElement.cpp (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLPlugInElement.cpp 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/html/HTMLPlugInElement.cpp 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> NPObject* HTMLPlugInElement::createNPObject()
</span><span class="cx"> {
</span><span class="cx"> // This shouldn't ever happen, but might as well check anyway
</span><del>- if (!document() || !document()->frame())
</del><ins>+ if (!document()->frame())
</ins><span class="cx"> return _NPN_CreateNoScriptObject();
</span><span class="cx">
</span><span class="cx"> // Can't create NPObjects when JavaScript is disabled
</span></span></pre></div>
<a id="trunkWebCoreplatformContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/ContextMenu.cpp (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/ContextMenu.cpp 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/platform/ContextMenu.cpp 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -377,11 +377,7 @@
</span><span class="cx"> if (item.type() == SeparatorType)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Document* document = m_hitTestResult.innerNonSharedNode()->document();
- if (!document)
- return;
-
- Frame* frame = document->frame();
</del><ins>+ Frame* frame = m_hitTestResult.innerNonSharedNode()->document()->frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/HitTestResult.cpp (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/HitTestResult.cpp 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/rendering/HitTestResult.cpp 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -159,15 +159,12 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String displayString(const String& string, const Node* node)
</del><ins>+String displayString(const String& string, const Node* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return string;
</span><del>- Document* document = node->document();
- if (!document)
- return string;
</del><span class="cx"> String copy(string);
</span><del>- copy.replace('\\', document->backslashAsCurrencySymbol());
</del><ins>+ copy.replace('\\', node->document()->backslashAsCurrencySymbol());
</ins><span class="cx"> return copy;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCorerenderingHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/HitTestResult.h (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/HitTestResult.h 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/rendering/HitTestResult.h 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -63,11 +63,11 @@
</span><span class="cx"> String spellingToolTip() const;
</span><span class="cx"> String title() const;
</span><span class="cx"> String altDisplayString() const;
</span><ins>+ String titleDisplayString() const;
</ins><span class="cx"> Image* image() const;
</span><span class="cx"> IntRect imageRect() const;
</span><span class="cx"> KURL absoluteImageURL() const;
</span><span class="cx"> KURL absoluteLinkURL() const;
</span><del>- String titleDisplayString() const;
</del><span class="cx"> String textContent() const;
</span><span class="cx"> bool isLiveLink() const;
</span><span class="cx"> bool isContentEditable() const;
</span><span class="lines">@@ -82,6 +82,8 @@
</span><span class="cx"> RefPtr<PlatformScrollbar> m_scrollbar;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+String displayString(const String&, const Node*);
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // HitTestResult_h
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderLayer.cpp (20722 => 20723)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderLayer.cpp 2007-04-05 16:35:43 UTC (rev 20722)
+++ trunk/WebCore/rendering/RenderLayer.cpp 2007-04-05 17:48:23 UTC (rev 20723)
</span><span class="lines">@@ -1910,7 +1910,6 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Document* doc = renderer()->document();
</span><del>- if (!doc) return;
</del><span class="cx">
</span><span class="cx"> Node* activeNode = doc->activeNode();
</span><span class="cx"> if (activeNode && !request.active) {
</span></span></pre>
</div>
</div>
</body>
</html>