<!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" />
<title>[44008] branches/WWDC-2009-branch/WebKit/mac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/44008">44008</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2009-05-21 16:23:04 -0700 (Thu, 21 May 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge r43973.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesWWDC2009branchWebKitmacChangeLog">branches/WWDC-2009-branch/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchesWWDC2009branchWebKitmacWebCoreSupportWebEditorClientmm">branches/WWDC-2009-branch/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#branchesWWDC2009branchWebKitmacWebViewWebHTMLViewmm">branches/WWDC-2009-branch/WebKit/mac/WebView/WebHTMLView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesWWDC2009branchWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/WWDC-2009-branch/WebKit/mac/ChangeLog (44007 => 44008)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WWDC-2009-branch/WebKit/mac/ChangeLog 2009-05-21 23:23:00 UTC (rev 44007)
+++ branches/WWDC-2009-branch/WebKit/mac/ChangeLog 2009-05-21 23:23:04 UTC (rev 44008)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2009-05-21 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><ins>+ Merge r43973.
+
+ 2009-05-21 Alexey Proskuryakov <ap@webkit.org>
+
+ Reviewed by Darin Adler.
+
+ <rdar://problem/6907542> REGRESSION (r43143): Hang in RenderLineBoxList::dirtyLinesFromChangedChild
+ when clicking link to load Flash animation (http://www.roambi.com)
+
+ * WebCoreSupport/WebEditorClient.mm: (WebEditorClient::respondToChangedSelection):
+ Don't call -[NSApplication updateWindows] here, WebHTMLView can take care of this.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView inputContext]): Use a precomputed boolean stored in WebHTMLViewPrivate, as
+ calling isTextInput() is not always safe.
+ (-[WebHTMLView textStorage]): Ditto.
+ (-[WebHTMLView _updateSelectionForInputManager]): Update _private->exposeInputContext when
+ selection changes, and let AppKit update its cache if necessary.
+
+2009-05-21 Mark Rowe <mrowe@apple.com>
+
</ins><span class="cx"> Merge r43969.
</span><span class="cx">
</span><span class="cx"> 2009-05-21 Alexey Proskuryakov <ap@webkit.org>
</span></span></pre></div>
<a id="branchesWWDC2009branchWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: branches/WWDC-2009-branch/WebKit/mac/WebCoreSupport/WebEditorClient.mm (44007 => 44008)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WWDC-2009-branch/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2009-05-21 23:23:00 UTC (rev 44007)
+++ branches/WWDC-2009-branch/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2009-05-21 23:23:04 UTC (rev 44008)
</span><span class="lines">@@ -284,9 +284,6 @@
</span><span class="cx"> if ([view isKindOfClass:[WebHTMLView class]])
</span><span class="cx"> [(WebHTMLView *)view _selectionChanged];
</span><span class="cx">
</span><del>- // Let AppKit cache a potentially changed input context.
- [[NSApplication sharedApplication] updateWindows];
-
</del><span class="cx"> // FIXME: This quirk is needed due to <rdar://problem/5009625> - We can phase it out once Aperture can adopt the new behavior on their end
</span><span class="cx"> if (!WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITHOUT_APERTURE_QUIRK) && [[[NSBundle mainBundle] bundleIdentifier] isEqualToString:@"com.apple.Aperture"])
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchesWWDC2009branchWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: branches/WWDC-2009-branch/WebKit/mac/WebView/WebHTMLView.mm (44007 => 44008)</h4>
<pre class="diff"><span>
<span class="info">--- branches/WWDC-2009-branch/WebKit/mac/WebView/WebHTMLView.mm 2009-05-21 23:23:00 UTC (rev 44007)
+++ branches/WWDC-2009-branch/WebKit/mac/WebView/WebHTMLView.mm 2009-05-21 23:23:04 UTC (rev 44008)
</span><span class="lines">@@ -455,6 +455,10 @@
</span><span class="cx"> BOOL handlingMouseDownEvent;
</span><span class="cx"> NSEvent *keyDownEvent; // Kept after handling the event.
</span><span class="cx">
</span><ins>+ // A WebHTMLView has a single input context, but we return nil when in non-editable content to avoid making input methods do their work.
+ // This state is saved each time selection changes, because computing it causes style recalc, which is not always safe to do.
+ BOOL exposeInputContext;
+
</ins><span class="cx"> NSPoint lastScrollPosition;
</span><span class="cx">
</span><span class="cx"> WebPluginController *pluginController;
</span><span class="lines">@@ -5493,16 +5497,12 @@
</span><span class="cx">
</span><span class="cx"> - (NSTextInputContext *)inputContext
</span><span class="cx"> {
</span><del>- Frame* coreFrame = core([self _frame]);
- if (!isTextInput(coreFrame) || isInPasswordField(coreFrame))
- return nil;
- return [super inputContext];
</del><ins>+ return _private->exposeInputContext ? [super inputContext] : nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSAttributedString *)textStorage
</span><span class="cx"> {
</span><del>- Frame* coreFrame = core([self _frame]);
- if (!isTextInput(coreFrame) || isInPasswordField(coreFrame)) {
</del><ins>+ if (!_private->exposeInputContext) {
</ins><span class="cx"> LOG(TextInput, "textStorage -> nil");
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="lines">@@ -5851,6 +5851,13 @@
</span><span class="cx"> if (!coreFrame)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ BOOL exposeInputContext = isTextInput(coreFrame) && !isInPasswordField(coreFrame);
+ if (exposeInputContext != _private->exposeInputContext) {
+ // Let AppKit cache a potentially input context.
+ _private->exposeInputContext = exposeInputContext;
+ [[NSApplication sharedApplication] updateWindows];
+ }
+
</ins><span class="cx"> if (!coreFrame->editor()->hasComposition())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>