OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 1815 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1826 if (m_textFinder && m_textFinder->scopingInProgress()) { | 1826 if (m_textFinder && m_textFinder->scopingInProgress()) { |
1827 | 1827 |
1828 // There is a possibility that the frame being detached was the only | 1828 // There is a possibility that the frame being detached was the only |
1829 // pending one. We need to make sure final replies can be sent. | 1829 // pending one. We need to make sure final replies can be sent. |
1830 m_textFinder->flushCurrentScoping(); | 1830 m_textFinder->flushCurrentScoping(); |
1831 | 1831 |
1832 m_textFinder->cancelPendingScopingEffort(); | 1832 m_textFinder->cancelPendingScopingEffort(); |
1833 } | 1833 } |
1834 } | 1834 } |
1835 | 1835 |
1836 void WebLocalFrameImpl::removeSpellingMarkersUnderWords(const WebVector<WebStrin g>& words) | |
1837 { | |
1838 Vector<String> transformedWords(words.size()); | |
1839 | |
1840 auto wordsBegin = words.data(); | |
1841 auto wordsEnd = words.data() + words.size(); | |
1842 auto transformedWordsBegin = transformedWords.begin(); | |
1843 | |
1844 std::transform(wordsBegin, wordsEnd, transformedWordsBegin, | |
1845 [] (const WebString &webString) { return static_cast<String>(webString); }); | |
groby-ooo-7-16
2014/07/30 21:13:27
Is blink switched to C11? Chrome style guide says
Klemen Forstnerič
2014/07/31 17:14:00
Whoops, my bad. I tried it and when it compiled I
groby-ooo-7-16
2014/08/01 00:13:23
Note: I don't know about blink. I would _assume_ i
Klemen Forstnerič
2014/08/01 21:58:17
No worries, lambda expressions are nice but if the
| |
1846 | |
1847 frame()->spellChecker().removeSpellingMarkersUnderWords(transformedWords); | |
1848 } | |
1849 | |
1836 WebLocalFrameImpl* WebLocalFrameImpl::activeMatchFrame() const | 1850 WebLocalFrameImpl* WebLocalFrameImpl::activeMatchFrame() const |
1837 { | 1851 { |
1838 ASSERT(!parent()); | 1852 ASSERT(!parent()); |
1839 | 1853 |
1840 if (m_textFinder) | 1854 if (m_textFinder) |
1841 return m_textFinder->activeMatchFrame(); | 1855 return m_textFinder->activeMatchFrame(); |
1842 return 0; | 1856 return 0; |
1843 } | 1857 } |
1844 | 1858 |
1845 blink::Range* WebLocalFrameImpl::activeMatch() const | 1859 blink::Range* WebLocalFrameImpl::activeMatch() const |
(...skipping 23 matching lines...) Expand all Loading... | |
1869 | 1883 |
1870 void WebLocalFrameImpl::invalidateAll() const | 1884 void WebLocalFrameImpl::invalidateAll() const |
1871 { | 1885 { |
1872 ASSERT(frame() && frame()->view()); | 1886 ASSERT(frame() && frame()->view()); |
1873 FrameView* view = frame()->view(); | 1887 FrameView* view = frame()->view(); |
1874 view->invalidateRect(view->frameRect()); | 1888 view->invalidateRect(view->frameRect()); |
1875 invalidateScrollbar(); | 1889 invalidateScrollbar(); |
1876 } | 1890 } |
1877 | 1891 |
1878 } // namespace blink | 1892 } // namespace blink |
OLD | NEW |