<!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>[24000] trunk</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/24000">24000</a></dd>
<dt>Author</dt> <dd>aroben</dd>
<dt>Date</dt> <dd>2007-07-04 20:00:55 -0700 (Wed, 04 Jul 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move tooltip logic down into WebCore so that it can be shared cross-platform
WebCore:
Move tooltip logic down into WebCore so that it can be shared cross-platform
Reviewed by Sam.
* page/Chrome.cpp:
(WebCore::Chrome::setToolTip): Added.
* page/Chrome.h:
* page/ChromeClient.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::mouseMoved): Call Chrome::setToolTip.
* platform/graphics/svg/SVGImageEmptyClients.h:
Added stubs for Gdk:
* platform/gdk/ChromeClientGdk.h:
* platform/gdk/TemporaryLinkStubs.cpp:
(ChromeClientGdk::setToolTip):
WebKit:
Move tooltip logic down into WebCore so that it can be shared cross-platform
Reviewed by Sam.
* WebCoreSupport/WebChromeClient.h:
* WebCoreSupport/WebChromeClient.mm:
(WebChromeClient::setToolTip): Added.
* WebView/WebHTMLView.mm: Removed _resetCachedWebPreferences.
(-[WebHTMLView _updateMouseoverWithEvent:]): Removed tooltip code.
(-[WebHTMLView initWithFrame:]): Removed call to
_resetCachedWebPreferences.
(-[WebHTMLView setDataSource:]): Ditto.
* WebView/WebHTMLViewInternal.h: Removed showsURLsInToolTips ivar.
* WebView/WebHTMLViewPrivate.h: Added declaration for _setTooltip so
that WebChromeClient can call it.
WebKit/win:
Added a stub for WebChromeClient::setToolTip
Reviewed by Sam.
* WebChromeClient.cpp:
* WebChromeClient.h:
WebKitQt:
Added a stub for ChromeClientQt::setToolTip
Reviewed by Sam.
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::setToolTip):
* WebCoreSupport/ChromeClientQt.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageChromecpp">trunk/WebCore/page/Chrome.cpp</a></li>
<li><a href="#trunkWebCorepageChromeh">trunk/WebCore/page/Chrome.h</a></li>
<li><a href="#trunkWebCorepageChromeClienth">trunk/WebCore/page/ChromeClient.h</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkWebCoreplatformgdkChromeClientGdkh">trunk/WebCore/platform/gdk/ChromeClientGdk.h</a></li>
<li><a href="#trunkWebCoreplatformgdkTemporaryLinkStubscpp">trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp</a></li>
<li><a href="#trunkWebCoreplatformgraphicssvgSVGImageEmptyClientsh">trunk/WebCore/platform/graphics/svg/SVGImageEmptyClients.h</a></li>
<li><a href="#trunkWebKitChangeLog">trunk/WebKit/ChangeLog</a></li>
<li><a href="#trunkWebKitWebCoreSupportWebChromeClienth">trunk/WebKit/WebCoreSupport/WebChromeClient.h</a></li>
<li><a href="#trunkWebKitWebCoreSupportWebChromeClientmm">trunk/WebKit/WebCoreSupport/WebChromeClient.mm</a></li>
<li><a href="#trunkWebKitWebViewWebHTMLViewmm">trunk/WebKit/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkWebKitWebViewWebHTMLViewInternalh">trunk/WebKit/WebView/WebHTMLViewInternal.h</a></li>
<li><a href="#trunkWebKitWebViewWebHTMLViewPrivateh">trunk/WebKit/WebView/WebHTMLViewPrivate.h</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebChromeClientcpp">trunk/WebKit/win/WebChromeClient.cpp</a></li>
<li><a href="#trunkWebKitwinWebChromeClienth">trunk/WebKit/win/WebChromeClient.h</a></li>
<li><a href="#trunkWebKitQtChangeLog">trunk/WebKitQt/ChangeLog</a></li>
<li><a href="#trunkWebKitQtWebCoreSupportChromeClientQtcpp">trunk/WebKitQt/WebCoreSupport/ChromeClientQt.cpp</a></li>
<li><a href="#trunkWebKitQtWebCoreSupportChromeClientQth">trunk/WebKitQt/WebCoreSupport/ChromeClientQt.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/ChangeLog 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2007-07-04 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><ins>+ Move tooltip logic down into WebCore so that it can be shared cross-platform
+
+ Reviewed by Sam.
+
+ * page/Chrome.cpp:
+ (WebCore::Chrome::setToolTip): Added.
+ * page/Chrome.h:
+ * page/ChromeClient.h:
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::mouseMoved): Call Chrome::setToolTip.
+ * platform/graphics/svg/SVGImageEmptyClients.h:
+
+ Added stubs for Gdk:
+
+ * platform/gdk/ChromeClientGdk.h:
+ * platform/gdk/TemporaryLinkStubs.cpp:
+ (ChromeClientGdk::setToolTip):
+
+2007-07-04 Adam Roben <aroben@apple.com>
+
</ins><span class="cx"> Add Settings::showsURLsInToolTips
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam.
</span></span></pre></div>
<a id="trunkWebCorepageChromecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Chrome.cpp (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Chrome.cpp 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/page/Chrome.cpp 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -25,15 +25,21 @@
</span><span class="cx"> #include "ChromeClient.h"
</span><span class="cx"> #include "FloatRect.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "HTMLFormElement.h"
+#include "HTMLInputElement.h"
+#include "HTMLNames.h"
</ins><span class="cx"> #include "InspectorController.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+using namespace HTMLNames;
+
</ins><span class="cx"> class PageGroupLoadDeferrer : Noncopyable {
</span><span class="cx"> public:
</span><span class="cx"> PageGroupLoadDeferrer(Page*, bool deferSelf);
</span><span class="lines">@@ -298,6 +304,36 @@
</span><span class="cx"> m_client->mouseDidMoveOverElement(result, modifierFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Chrome::setToolTip(const HitTestResult& result)
+{
+ // First priority is a potential toolTip representing a spelling or grammar error
+ String toolTip = result.spellingToolTip();
+
+ // Next priority is a toolTip from a URL beneath the mouse (if preference is set to show those).
+ if (toolTip.isEmpty() && m_page->settings()->showsURLsInToolTips()) {
+ if (Node* node = result.innerNonSharedNode()) {
+ // Get tooltip representing form action, if relevant
+ if (node->hasTagName(inputTag)) {
+ HTMLInputElement* input = static_cast<HTMLInputElement*>(node);
+ if (input->inputType() == HTMLInputElement::SUBMIT)
+ if (HTMLFormElement* form = input->form())
+ toolTip = form->action();
+ }
+ }
+
+ // Get tooltip representing link's URL
+ if (toolTip.isEmpty())
+ // FIXME: Need to pass this URL through userVisibleString once that's in WebCore
+ toolTip = result.absoluteLinkURL().url();
+ }
+
+ // Lastly we'll consider a tooltip for element with "title" attribute
+ if (toolTip.isEmpty())
+ toolTip = result.title();
+
+ m_client->setToolTip(toolTip);
+}
+
</ins><span class="cx"> PageGroupLoadDeferrer::PageGroupLoadDeferrer(Page* page, bool deferSelf)
</span><span class="cx"> {
</span><span class="cx"> if (const HashSet<Page*>* group = page->frameNamespace()) {
</span></span></pre></div>
<a id="trunkWebCorepageChromeh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/Chrome.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/Chrome.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/page/Chrome.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -121,6 +121,8 @@
</span><span class="cx">
</span><span class="cx"> void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><span class="cx">
</span><ins>+ void setToolTip(const HitTestResult&);
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void focusNSView(NSView*);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkWebCorepageChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/ChromeClient.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/ChromeClient.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/page/ChromeClient.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx"> virtual void updateBackingStore() = 0;
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) = 0;
</span><ins>+
+ virtual void setToolTip(const String&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/page/EventHandler.cpp 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -893,6 +893,7 @@
</span><span class="cx">
</span><span class="cx"> hoveredNode.setToNonShadowAncestor();
</span><span class="cx"> page->chrome()->mouseDidMoveOverElement(hoveredNode, event.modifierFlags());
</span><ins>+ page->chrome()->setToolTip(hoveredNode);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCoreplatformgdkChromeClientGdkh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gdk/ChromeClientGdk.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gdk/ChromeClientGdk.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/platform/gdk/ChromeClientGdk.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -89,6 +89,8 @@
</span><span class="cx"> virtual void updateBackingStore();
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><ins>+
+ virtual void setToolTip(const String&);
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCoreplatformgdkTemporaryLinkStubscpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -173,6 +173,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ChromeClientGdk::setToolTip(const String&)
+{
+ notImplemented();
+}
+
</ins><span class="cx"> /********************************************************/
</span><span class="cx"> /* Completely empty stubs (mostly to allow DRT to run): */
</span><span class="cx"> /********************************************************/
</span></span></pre></div>
<a id="trunkWebCoreplatformgraphicssvgSVGImageEmptyClientsh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/graphics/svg/SVGImageEmptyClients.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/graphics/svg/SVGImageEmptyClients.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebCore/platform/graphics/svg/SVGImageEmptyClients.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -112,6 +112,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) { }
</span><span class="cx">
</span><ins>+ virtual void setToolTip(const String&) { }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class SVGEmptyFrameLoaderClient : public FrameLoaderClient {
</span></span></pre></div>
<a id="trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/ChangeLog (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/ChangeLog 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/ChangeLog 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2007-07-04 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><ins>+ Move tooltip logic down into WebCore so that it can be shared cross-platform
+
+ Reviewed by Sam.
+
+ * WebCoreSupport/WebChromeClient.h:
+ * WebCoreSupport/WebChromeClient.mm:
+ (WebChromeClient::setToolTip): Added.
+ * WebView/WebHTMLView.mm: Removed _resetCachedWebPreferences.
+ (-[WebHTMLView _updateMouseoverWithEvent:]): Removed tooltip code.
+ (-[WebHTMLView initWithFrame:]): Removed call to
+ _resetCachedWebPreferences.
+ (-[WebHTMLView setDataSource:]): Ditto.
+ * WebView/WebHTMLViewInternal.h: Removed showsURLsInToolTips ivar.
+ * WebView/WebHTMLViewPrivate.h: Added declaration for _setTooltip so
+ that WebChromeClient can call it.
+
+2007-07-04 Adam Roben <aroben@apple.com>
+
</ins><span class="cx"> Initialize Settings::showsURLsInToolTips
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam.
</span></span></pre></div>
<a id="trunkWebKitWebCoreSupportWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebCoreSupport/WebChromeClient.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebCoreSupport/WebChromeClient.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/WebCoreSupport/WebChromeClient.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -97,6 +97,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags);
</span><span class="cx">
</span><ins>+ virtual void setToolTip(const WebCore::String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebView *m_webView;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkWebKitWebCoreSupportWebChromeClientmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebCoreSupport/WebChromeClient.mm (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebCoreSupport/WebChromeClient.mm 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/WebCoreSupport/WebChromeClient.mm 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #import "WebFrameInternal.h"
</span><span class="cx"> #import "WebFrameView.h"
</span><span class="cx"> #import "WebHTMLView.h"
</span><ins>+#import "WebHTMLViewPrivate.h"
</ins><span class="cx"> #import "WebNSURLRequestExtras.h"
</span><span class="cx"> #import "WebUIDelegate.h"
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="lines">@@ -376,3 +377,8 @@
</span><span class="cx"> [m_webView _mouseDidMoveOverElement:element modifierFlags:modifierFlags];
</span><span class="cx"> [element release];
</span><span class="cx"> }
</span><ins>+
+void WebChromeClient::setToolTip(const String& toolTip)
+{
+ [(WebHTMLView *)[[[m_webView mainFrame] frameView] documentView] _setToolTip:toolTip];
+}
</ins></span></pre></div>
<a id="trunkWebKitWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebView/WebHTMLView.mm (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebView/WebHTMLView.mm 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/WebView/WebHTMLView.mm 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -1185,35 +1185,6 @@
</span><span class="cx"> if (Frame* coreFrame = core([view _frame]))
</span><span class="cx"> coreFrame->eventHandler()->mouseMoved(event);
</span><span class="cx">
</span><del>- NSPoint point = [view convertPoint:[event locationInWindow] fromView:nil];
- NSDictionary *element = [view elementAtPoint:point];
-
- // Set a tool tip; it won't show up right away but will if the user pauses.
-
- // First priority is a potential toolTip representing a spelling or grammar error
- NSString *newToolTip = [element objectForKey:WebElementSpellingToolTipKey];
-
- // Next priority is a toolTip from a URL beneath the mouse (if preference is set to show those).
- if ([newToolTip length] == 0 && _private->showsURLsInToolTips) {
- DOMHTMLElement *domElement = [element objectForKey:WebElementDOMNodeKey];
-
- // Get tooltip representing form action, if relevant
- if ([domElement isKindOfClass:[DOMHTMLInputElement class]]) {
- if ([[(DOMHTMLInputElement *)domElement type] isEqualToString:@"submit"])
- newToolTip = [[(DOMHTMLInputElement *) domElement form] action];
- }
-
- // Get tooltip representing link's URL
- if ([newToolTip length] == 0)
- newToolTip = [[element objectForKey:WebElementLinkURLKey] _web_userVisibleString];
- }
-
- // Lastly we'll consider a tooltip for element with "title" attribute
- if ([newToolTip length] == 0)
- newToolTip = [element objectForKey:WebElementTitleKey];
-
- [view _setToolTip:newToolTip];
-
</del><span class="cx"> [view release];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1848,16 +1819,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_resetCachedWebPreferences:(NSNotification *)ignored
-{
- WebPreferences *preferences = [[self _webView] preferences];
- // Check for nil because we might not yet have an associated webView when this is called
- if (preferences == nil)
- preferences = [WebPreferences standardPreferences];
-
- _private->showsURLsInToolTips = [preferences showsURLsInToolTips];
-}
-
</del><span class="cx"> - (id)initWithFrame:(NSRect)frame
</span><span class="cx"> {
</span><span class="cx"> self = [super initWithFrame:frame];
</span><span class="lines">@@ -1873,10 +1834,6 @@
</span><span class="cx">
</span><span class="cx"> _private->pluginController = [[WebPluginController alloc] initWithDocumentView:self];
</span><span class="cx"> _private->needsLayout = YES;
</span><del>- [self _resetCachedWebPreferences:nil];
- [[NSNotificationCenter defaultCenter]
- addObserver:self selector:@selector(_resetCachedWebPreferences:)
- name:WebPreferencesChangedNotification object:nil];
</del><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -3053,7 +3010,6 @@
</span><span class="cx"> [_private->pluginController setDataSource:dataSource];
</span><span class="cx"> [self addMouseMovedObserver];
</span><span class="cx"> }
</span><del>- [self _resetCachedWebPreferences:nil];
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dataSourceUpdated:(WebDataSource *)dataSource
</span></span></pre></div>
<a id="trunkWebKitWebViewWebHTMLViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebView/WebHTMLViewInternal.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebView/WebHTMLViewInternal.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/WebView/WebHTMLViewInternal.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> BOOL closed;
</span><span class="cx"> BOOL needsLayout;
</span><span class="cx"> BOOL needsToApplyStyles;
</span><del>- BOOL showsURLsInToolTips;
</del><span class="cx"> BOOL ignoringMouseDraggedEvents;
</span><span class="cx"> BOOL printing;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebKitWebViewWebHTMLViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/WebView/WebHTMLViewPrivate.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/WebView/WebHTMLViewPrivate.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/WebView/WebHTMLViewPrivate.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx"> - (BOOL)_transparentBackground;
</span><span class="cx"> - (void)_setTransparentBackground:(BOOL)f;
</span><span class="cx">
</span><ins>+- (void)_setToolTip:(NSString *)string;
+
</ins><span class="cx"> // SPI's for Mail.
</span><span class="cx"> - (NSImage *)_selectionDraggingImage;
</span><span class="cx"> - (NSRect)_selectionDraggingRect;
</span></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/win/ChangeLog 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2007-07-04 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><ins>+ Added a stub for WebChromeClient::setToolTip
+
+ Reviewed by Sam.
+
+ * WebChromeClient.cpp:
+ * WebChromeClient.h:
+
+2007-07-04 Adam Roben <aroben@apple.com>
+
</ins><span class="cx"> Initialize Settings::showsURLsInToolTips
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam.
</span></span></pre></div>
<a id="trunkWebKitwinWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebChromeClient.cpp (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebChromeClient.cpp 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/win/WebChromeClient.cpp 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -437,3 +437,7 @@
</span><span class="cx">
</span><span class="cx"> uiDelegate->mouseDidMoveOverElement(m_webView, element.get(), modifierFlags);
</span><span class="cx"> }
</span><ins>+
+void WebChromeClient::setToolTip(const String&)
+{
+}
</ins></span></pre></div>
<a id="trunkWebKitwinWebChromeClienth"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebChromeClient.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebChromeClient.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKit/win/WebChromeClient.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -90,6 +90,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const WebCore::HitTestResult&, unsigned modifierFlags);
</span><span class="cx">
</span><ins>+ virtual void setToolTip(const WebCore::String&);
+
</ins><span class="cx"> private:
</span><span class="cx"> WebView* m_webView;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkWebKitQtChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/ChangeLog (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/ChangeLog 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKitQt/ChangeLog 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2007-07-04 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><ins>+ Added a stub for ChromeClientQt::setToolTip
+
+ Reviewed by Sam.
+
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::setToolTip):
+ * WebCoreSupport/ChromeClientQt.h:
+
+2007-07-04 Adam Roben <aroben@apple.com>
+
</ins><span class="cx"> Added a stub for ChromeClientQt::mouseDidMoveOverElement
</span><span class="cx">
</span><span class="cx"> Reviewed by Sam.
</span></span></pre></div>
<a id="trunkWebKitQtWebCoreSupportChromeClientQtcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/WebCoreSupport/ChromeClientQt.cpp (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/WebCoreSupport/ChromeClientQt.cpp 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKitQt/WebCoreSupport/ChromeClientQt.cpp 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -299,6 +299,11 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ChromeClientQt::setToolTip(const String&)
+{
+ notImplemented();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
</ins><span class="cx">
</span><ins>+
</ins></span></pre></div>
<a id="trunkWebKitQtWebCoreSupportChromeClientQth"></a>
<div class="modfile"><h4>Modified: trunk/WebKitQt/WebCoreSupport/ChromeClientQt.h (23999 => 24000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitQt/WebCoreSupport/ChromeClientQt.h 2007-07-05 03:00:41 UTC (rev 23999)
+++ trunk/WebKitQt/WebCoreSupport/ChromeClientQt.h 2007-07-05 03:00:55 UTC (rev 24000)
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags);
</span><span class="cx">
</span><ins>+ virtual void setToolTip(const String&);
+
</ins><span class="cx"> QWebPage* m_webPage;
</span><span class="cx"> };
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>