Title: [120689] trunk/Source/WebKit/chromium
- Revision
- 120689
- Author
- [email protected]
- Date
- 2012-06-19 01:15:21 -0700 (Tue, 19 Jun 2012)
Log Message
Unreviewed, rolling out r120586.
http://trac.webkit.org/changeset/120586
https://bugs.webkit.org/show_bug.cgi?id=89444
doesn't fix mac issue (Requested by morrita on #webkit).
Patch by Sheriff Bot <[email protected]> on 2012-06-19
* src/ContextMenuClientImpl.cpp:
(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
* src/WebFrameImpl.cpp:
(WebKit::WebFrameImpl::replaceMisspelledRange):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (120688 => 120689)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 07:40:43 UTC (rev 120688)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-06-19 08:15:21 UTC (rev 120689)
@@ -1,3 +1,16 @@
+2012-06-19 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r120586.
+ http://trac.webkit.org/changeset/120586
+ https://bugs.webkit.org/show_bug.cgi?id=89444
+
+ doesn't fix mac issue (Requested by morrita on #webkit).
+
+ * src/ContextMenuClientImpl.cpp:
+ (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::replaceMisspelledRange):
+
2012-06-19 Mike West <[email protected]>
Add a scheme registry for bypassing Content Security Policy.
Modified: trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (120688 => 120689)
--- trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-06-19 07:40:43 UTC (rev 120688)
+++ trunk/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-06-19 08:15:21 UTC (rev 120689)
@@ -279,7 +279,7 @@
// a mouse on a word, Chrome just needs to find a spelling marker on the word instread of spellchecking it.
if (selectedFrame->settings() && selectedFrame->settings()->asynchronousSpellCheckingEnabled()) {
RefPtr<Range> range = selectedFrame->selection()->toNormalizedRange();
- if (range.get() && range->collapsed()) {
+ if (range.get()) {
Vector<DocumentMarker*> markers = selectedFrame->document()->markers()->markersInRange(range.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
if (!markers.isEmpty()) {
Vector<String> suggestions;
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (120688 => 120689)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-06-19 07:40:43 UTC (rev 120688)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-06-19 08:15:21 UTC (rev 120689)
@@ -1355,11 +1355,10 @@
Vector<DocumentMarker*> markers = frame()->document()->markers()->markersInRange(caretRange.get(), DocumentMarker::Spelling | DocumentMarker::Grammar);
if (markers.size() < 1 || markers[0]->startOffset() >= markers[0]->endOffset())
return;
- caretRange->setStart(caretRange->firstNode(), markers[0]->startOffset());
- caretRange->setEnd(caretRange->firstNode(), markers[0]->endOffset());
- if (!frame()->selection()->shouldChangeSelection(caretRange.get()))
+ RefPtr<Range> markerRange = TextIterator::rangeFromLocationAndLength(frame()->selection()->rootEditableElementOrDocumentElement(), markers[0]->startOffset(), markers[0]->endOffset() - markers[0]->startOffset());
+ if (!markerRange.get() || !frame()->selection()->shouldChangeSelection(markerRange.get()))
return;
- frame()->selection()->setSelection(caretRange.get(), CharacterGranularity);
+ frame()->selection()->setSelection(markerRange.get(), CharacterGranularity);
frame()->editor()->replaceSelectionWithText(text, false, true);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
