| 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 1278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1289 frame()->document()->markers()->removeMarkers(DocumentMarker::Spelling | Doc
umentMarker::Grammar); | 1289 frame()->document()->markers()->removeMarkers(DocumentMarker::Spelling | Doc
umentMarker::Grammar); |
| 1290 } | 1290 } |
| 1291 | 1291 |
| 1292 bool WebFrameImpl::hasSelection() const | 1292 bool WebFrameImpl::hasSelection() const |
| 1293 { | 1293 { |
| 1294 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame()); | 1294 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame()); |
| 1295 if (pluginContainer) | 1295 if (pluginContainer) |
| 1296 return pluginContainer->plugin()->hasSelection(); | 1296 return pluginContainer->plugin()->hasSelection(); |
| 1297 | 1297 |
| 1298 // frame()->selection()->isNone() never returns true. | 1298 // frame()->selection()->isNone() never returns true. |
| 1299 return (frame()->selection()->start() != frame()->selection()->end()); | 1299 return frame()->selection()->start() != frame()->selection()->end(); |
| 1300 } | 1300 } |
| 1301 | 1301 |
| 1302 WebRange WebFrameImpl::selectionRange() const | 1302 WebRange WebFrameImpl::selectionRange() const |
| 1303 { | 1303 { |
| 1304 return frame()->selection()->toNormalizedRange(); | 1304 return frame()->selection()->toNormalizedRange(); |
| 1305 } | 1305 } |
| 1306 | 1306 |
| 1307 WebString WebFrameImpl::selectionAsText() const | 1307 WebString WebFrameImpl::selectionAsText() const |
| 1308 { | 1308 { |
| 1309 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame()); | 1309 WebPluginContainerImpl* pluginContainer = pluginContainerFromFrame(frame()); |
| (...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2498 | 2498 |
| 2499 // There is a possibility that the frame being detached was the only | 2499 // There is a possibility that the frame being detached was the only |
| 2500 // pending one. We need to make sure final replies can be sent. | 2500 // pending one. We need to make sure final replies can be sent. |
| 2501 flushCurrentScopingEffort(m_findRequestIdentifier); | 2501 flushCurrentScopingEffort(m_findRequestIdentifier); |
| 2502 | 2502 |
| 2503 cancelPendingScopingEffort(); | 2503 cancelPendingScopingEffort(); |
| 2504 } | 2504 } |
| 2505 } | 2505 } |
| 2506 | 2506 |
| 2507 } // namespace WebKit | 2507 } // namespace WebKit |
| OLD | NEW |