OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 3404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3415 continue; | 3415 continue; |
3416 const DocumentMarkerVector& documentMarkers = toLocalFrame(frame)->docum
ent()->markers().markers(); | 3416 const DocumentMarkerVector& documentMarkers = toLocalFrame(frame)->docum
ent()->markers().markers(); |
3417 for (size_t i = 0; i < documentMarkers.size(); ++i) | 3417 for (size_t i = 0; i < documentMarkers.size(); ++i) |
3418 result.append(documentMarkers[i]->hash()); | 3418 result.append(documentMarkers[i]->hash()); |
3419 } | 3419 } |
3420 markers->assign(result); | 3420 markers->assign(result); |
3421 } | 3421 } |
3422 | 3422 |
3423 void WebViewImpl::removeSpellingMarkersUnderWords(const WebVector<WebString>& wo
rds) | 3423 void WebViewImpl::removeSpellingMarkersUnderWords(const WebVector<WebString>& wo
rds) |
3424 { | 3424 { |
| 3425 Vector<String> convertedWords; |
| 3426 convertedWords.append(words.data(), words.size()); |
| 3427 |
3425 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver
seNext()) { | 3428 for (Frame* frame = m_page->mainFrame(); frame; frame = frame->tree().traver
seNext()) { |
3426 if (!frame->isLocalFrame()) | 3429 if (frame->isLocalFrame()) |
3427 continue; | 3430 toLocalFrame(frame)->removeSpellingMarkersUnderWords(convertedWords)
; |
3428 | |
3429 Vector<String> convertedWords; | |
3430 convertedWords.append(words.data(), words.size()); | |
3431 | |
3432 toLocalFrame(frame)->removeSpellingMarkersUnderWords(convertedWords); | |
3433 } | 3431 } |
3434 } | 3432 } |
3435 | 3433 |
3436 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo
int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers) | 3434 WebDragOperation WebViewImpl::dragTargetDragEnterOrOver(const WebPoint& clientPo
int, const WebPoint& screenPoint, DragAction dragAction, int keyModifiers) |
3437 { | 3435 { |
3438 ASSERT(m_currentDragData); | 3436 ASSERT(m_currentDragData); |
3439 | 3437 |
3440 m_currentDragData->setModifierKeyState(webInputEventKeyStateToPlatformEventK
eyState(keyModifiers)); | 3438 m_currentDragData->setModifierKeyState(webInputEventKeyStateToPlatformEventK
eyState(keyModifiers)); |
3441 DragData dragData( | 3439 DragData dragData( |
3442 m_currentDragData.get(), | 3440 m_currentDragData.get(), |
(...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4270 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4268 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4271 | 4269 |
4272 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4270 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4273 return false; | 4271 return false; |
4274 | 4272 |
4275 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4273 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4276 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4274 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4277 } | 4275 } |
4278 | 4276 |
4279 } // namespace blink | 4277 } // namespace blink |
OLD | NEW |