Title: [163580] branches/safari-537.60-branch/Source/WebKit/win
Diff
Modified: branches/safari-537.60-branch/Source/WebKit/win/ChangeLog (163579 => 163580)
--- branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2014-02-07 00:54:55 UTC (rev 163579)
+++ branches/safari-537.60-branch/Source/WebKit/win/ChangeLog 2014-02-07 00:58:51 UTC (rev 163580)
@@ -1,3 +1,19 @@
+2014-02-06 Lucas Forschler <[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.
+
2013-12-05 Brent Fulgham <[email protected]>
Merge r160184
Modified: branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp (163579 => 163580)
--- branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2014-02-07 00:54:55 UTC (rev 163579)
+++ branches/safari-537.60-branch/Source/WebKit/win/WebView.cpp 2014-02-07 00:58:51 UTC (rev 163580)
@@ -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
