| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2013 Apple Inc. All rights reserved. | 3 * Copyright (C) 2013 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 2311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2322 return; | 2322 return; |
| 2323 } | 2323 } |
| 2324 networkStateNotifier().setWebConnectionTypeForTest(webtype); | 2324 networkStateNotifier().setWebConnectionTypeForTest(webtype); |
| 2325 } | 2325 } |
| 2326 | 2326 |
| 2327 unsigned Internals::countHitRegions(CanvasRenderingContext2D* context) | 2327 unsigned Internals::countHitRegions(CanvasRenderingContext2D* context) |
| 2328 { | 2328 { |
| 2329 return context->hitRegionsCount(); | 2329 return context->hitRegionsCount(); |
| 2330 } | 2330 } |
| 2331 | 2331 |
| 2332 String Internals::serializeNavigationMarkup(Document* document, ExceptionState&
exceptionState) |
| 2333 { |
| 2334 Vector<Document::TransitionElementData> elementData; |
| 2335 frame()->document()->getTransitionElementData(elementData, exceptionState); |
| 2336 |
| 2337 String markup; |
| 2338 Vector<Document::TransitionElementData>::iterator iter = elementData.begin()
; |
| 2339 for (; iter != elementData.end(); ++iter) |
| 2340 markup = markup + iter->markup; |
| 2341 |
| 2342 return markup; |
| 2343 } |
| 2344 |
| 2332 } // namespace WebCore | 2345 } // namespace WebCore |
| OLD | NEW |