Title: [163571] branches/safari-537.75-branch/Source/WebKit/win
- Revision
- 163571
- Author
- [email protected]
- Date
- 2014-02-06 16:25:18 -0800 (Thu, 06 Feb 2014)
Log Message
Merge r163557.
2014-02-06 Brent Fulgham <[email protected]>
[Win] Correct IME Regression after r141479
https://bugs.webkit.org/show_bug.cgi?id=128323
<rdar://problem/15952986>
Reviewed by Tim Horton.
* WebView.cpp:
(WebView::updateSelectionForIME): Refactoring flipped the meaning of the test used
to select the resetIME case. Corrected for behavior of new cancel method.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (163570 => 163571)
--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-07 00:03:15 UTC (rev 163570)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-07 00:25:18 UTC (rev 163571)
@@ -1,3 +1,19 @@
+2014-02-06 Brent Fulgham <[email protected]>
+
+ Merge r163557.
+
+ 2014-02-06 Brent Fulgham <[email protected]>
+
+ [Win] Correct IME Regression after r141479
+ https://bugs.webkit.org/show_bug.cgi?id=128323
+ <rdar://problem/15952986>
+
+ Reviewed by Tim Horton.
+
+ * WebView.cpp:
+ (WebView::updateSelectionForIME): Refactoring flipped the meaning of the test used
+ to select the resetIME case. Corrected for behavior of new cancel method.
+
2014-02-05 Brent Fulgham <[email protected]>
Merge r154146
Modified: branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp (163570 => 163571)
--- branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-02-07 00:03:15 UTC (rev 163570)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebView.cpp 2014-02-07 00:25:18 UTC (rev 163571)
@@ -5562,7 +5562,7 @@
if (!targetFrame)
return;
- if (!targetFrame->editor().cancelCompositionIfSelectionIsInvalid())
+ if (targetFrame->editor().cancelCompositionIfSelectionIsInvalid())
resetIME(targetFrame);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
