Title: [95209] branches/safari-534.51-branch/Source/WebKit2
- Revision
- 95209
- Author
- mr...@apple.com
- Date
- 2011-09-15 12:12:59 -0700 (Thu, 15 Sep 2011)
Log Message
Merge r94818.
Modified Paths
Diff
Modified: branches/safari-534.51-branch/Source/WebKit2/ChangeLog (95208 => 95209)
--- branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-09-15 19:05:12 UTC (rev 95208)
+++ branches/safari-534.51-branch/Source/WebKit2/ChangeLog 2011-09-15 19:12:59 UTC (rev 95209)
@@ -1,3 +1,20 @@
+2011-09-15 Mark Rowe <mr...@apple.com>
+
+ Merge r94818.
+
+ 2011-09-08 Mark Rowe <mr...@apple.com>
+
+ <rdar://problem/9742393> Spell checking a text area causes the page to reload
+
+ Ensure that m_pendingLearnOrIgnoreWordMessageCount is incremented when we use
+ executeEditCommand to ignore a word. This will ensure that WebPageProxy::ignoreWord
+ is expecting to be called, and will not turn around and terminate the web process.
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::executeEditCommand):
+
2011-08-23 Mark Rowe <mr...@apple.com>
Merge r93420.
Modified: branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (95208 => 95209)
--- branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-15 19:05:12 UTC (rev 95208)
+++ branches/safari-534.51-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-09-15 19:12:59 UTC (rev 95209)
@@ -700,6 +700,10 @@
if (!isValid())
return;
+ DEFINE_STATIC_LOCAL(String, ignoreSpellingCommandName, ("ignoreSpelling"));
+ if (commandName == ignoreSpellingCommandName)
+ ++m_pendingLearnOrIgnoreWordMessageCount;
+
process()->send(Messages::WebPage::ExecuteEditCommand(commandName), m_pageID);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
