| 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 1286 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1297     return; | 1297     return; | 
| 1298   } | 1298   } | 
| 1299 | 1299 | 
| 1300   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets | 1300   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets | 
| 1301   // needs to be audited.  See http://crbug.com/590369 for more details. | 1301   // needs to be audited.  See http://crbug.com/590369 for more details. | 
| 1302   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); | 1302   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets(); | 
| 1303 | 1303 | 
| 1304   frame()->inputMethodController().extendSelectionAndDelete(before, after); | 1304   frame()->inputMethodController().extendSelectionAndDelete(before, after); | 
| 1305 } | 1305 } | 
| 1306 | 1306 | 
|  | 1307 void WebLocalFrameImpl::deleteSurroundingText(int before, int after) { | 
|  | 1308   TRACE_EVENT0("blink", "WebLocalFrameImpl::deleteSurroundingText"); | 
|  | 1309   if (WebPlugin* plugin = focusedPluginIfInputMethodSupported()) { | 
|  | 1310     plugin->deleteSurroundingText(before, after); | 
|  | 1311     return; | 
|  | 1312   } | 
|  | 1313   frame()->inputMethodController().deleteSurroundingText(before, after); | 
|  | 1314 } | 
|  | 1315 | 
| 1307 void WebLocalFrameImpl::setCaretVisible(bool visible) { | 1316 void WebLocalFrameImpl::setCaretVisible(bool visible) { | 
| 1308   frame()->selection().setCaretVisible(visible); | 1317   frame()->selection().setCaretVisible(visible); | 
| 1309 } | 1318 } | 
| 1310 | 1319 | 
| 1311 VisiblePosition WebLocalFrameImpl::visiblePositionForViewportPoint( | 1320 VisiblePosition WebLocalFrameImpl::visiblePositionForViewportPoint( | 
| 1312     const WebPoint& pointInViewport) { | 1321     const WebPoint& pointInViewport) { | 
| 1313   return visiblePositionForContentsPoint( | 1322   return visiblePositionForContentsPoint( | 
| 1314       frame()->view()->viewportToContents(pointInViewport), frame()); | 1323       frame()->view()->viewportToContents(pointInViewport), frame()); | 
| 1315 } | 1324 } | 
| 1316 | 1325 | 
| (...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2347     feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 2356     feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; | 
| 2348   } else if (metric == "wasAlternateProtocolAvailable") { | 2357   } else if (metric == "wasAlternateProtocolAvailable") { | 
| 2349     feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 2358     feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; | 
| 2350   } else if (metric == "connectionInfo") { | 2359   } else if (metric == "connectionInfo") { | 
| 2351     feature = UseCounter::ChromeLoadTimesConnectionInfo; | 2360     feature = UseCounter::ChromeLoadTimesConnectionInfo; | 
| 2352   } | 2361   } | 
| 2353   UseCounter::count(frame(), feature); | 2362   UseCounter::count(frame(), feature); | 
| 2354 } | 2363 } | 
| 2355 | 2364 | 
| 2356 }  // namespace blink | 2365 }  // namespace blink | 
| OLD | NEW | 
|---|