OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 858 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
869 } | 869 } |
870 | 870 |
871 void WebFrameWidgetImpl::didLosePointerLock() | 871 void WebFrameWidgetImpl::didLosePointerLock() |
872 { | 872 { |
873 page()->pointerLockController().didLosePointerLock(); | 873 page()->pointerLockController().didLosePointerLock(); |
874 } | 874 } |
875 | 875 |
876 bool WebFrameWidgetImpl::getCompositionCharacterBounds(WebVector<WebRect>& bound
s) | 876 bool WebFrameWidgetImpl::getCompositionCharacterBounds(WebVector<WebRect>& bound
s) |
877 { | 877 { |
878 WebRange range = compositionRange(); | 878 WebRange range = compositionRange(); |
879 if (range.isNull()) | 879 if (range.isEmpty()) |
880 return false; | |
881 | |
882 if (range.length() == 0) | |
883 return false; | 880 return false; |
884 | 881 |
885 LocalFrame* frame = focusedLocalFrameInWidget(); | 882 LocalFrame* frame = focusedLocalFrameInWidget(); |
886 if (!frame) | 883 if (!frame) |
887 return false; | 884 return false; |
888 | 885 |
889 WebLocalFrameImpl* webLocalFrame = WebLocalFrameImpl::fromFrame(frame); | 886 WebLocalFrameImpl* webLocalFrame = WebLocalFrameImpl::fromFrame(frame); |
890 size_t characterCount = range.length(); | 887 size_t characterCount = range.length(); |
891 size_t offset = range.startOffset(); | 888 size_t offset = range.startOffset(); |
892 WebVector<WebRect> result(characterCount); | 889 WebVector<WebRect> result(characterCount); |
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1462 } | 1459 } |
1463 | 1460 |
1464 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const | 1461 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const |
1465 { | 1462 { |
1466 if (!m_imeAcceptEvents) | 1463 if (!m_imeAcceptEvents) |
1467 return nullptr; | 1464 return nullptr; |
1468 return focusedLocalFrameInWidget(); | 1465 return focusedLocalFrameInWidget(); |
1469 } | 1466 } |
1470 | 1467 |
1471 } // namespace blink | 1468 } // namespace blink |
OLD | NEW |