| Index: content/renderer/text_input_client_observer.cc
|
| diff --git a/content/renderer/text_input_client_observer.cc b/content/renderer/text_input_client_observer.cc
|
| index 3c953eebaad238155ab72433c28dbed90b5422e2..d738e546268b1c475692d022545a196e63586b95 100644
|
| --- a/content/renderer/text_input_client_observer.cc
|
| +++ b/content/renderer/text_input_client_observer.cc
|
| @@ -87,13 +87,10 @@ void TextInputClientObserver::OnFirstRectForCharacterRange(gfx::Range range) {
|
| } else
|
| #endif
|
| {
|
| - blink::WebFrame* frame = webview()->focusedFrame();
|
| - if (frame) {
|
| - blink::WebRect web_rect;
|
| - frame->firstRectForCharacterRange(range.start(), range.length(),
|
| - web_rect);
|
| - rect = web_rect;
|
| - }
|
| + blink::WebLocalFrame* frame = webview()->focusedFrame();
|
| + blink::WebRect web_rect;
|
| + frame->firstRectForCharacterRange(range.start(), range.length(), web_rect);
|
| + rect = web_rect;
|
| }
|
| Send(new TextInputClientReplyMsg_GotFirstRectForRange(routing_id(), rect));
|
| }
|
| @@ -102,11 +99,9 @@ void TextInputClientObserver::OnStringForRange(gfx::Range range) {
|
| #if defined(OS_MACOSX)
|
| blink::WebPoint baselinePoint;
|
| NSAttributedString* string = nil;
|
| - blink::WebLocalFrame* frame = webview()->focusedFrame()->toWebLocalFrame();
|
| - if (frame) {
|
| - string = blink::WebSubstringUtil::attributedSubstringInRange(
|
| - frame, range.start(), range.length(), &baselinePoint);
|
| - }
|
| + blink::WebLocalFrame* frame = webview()->focusedFrame();
|
| + string = blink::WebSubstringUtil::attributedSubstringInRange(
|
| + frame, range.start(), range.length(), &baselinePoint);
|
| std::unique_ptr<const mac::AttributedStringCoder::EncodedString> encoded(
|
| mac::AttributedStringCoder::Encode(string));
|
| Send(new TextInputClientReplyMsg_GotStringForRange(routing_id(),
|
|
|