Chromium Code Reviews| 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 2357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2368 webtype = blink::ConnectionTypeOther; | 2368 webtype = blink::ConnectionTypeOther; |
| 2369 } else if (type == "none") { | 2369 } else if (type == "none") { |
| 2370 webtype = blink::ConnectionTypeNone; | 2370 webtype = blink::ConnectionTypeNone; |
| 2371 } else { | 2371 } else { |
| 2372 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile dToEnumerate("connection type", type)); | 2372 exceptionState.throwDOMException(NotFoundError, ExceptionMessages::faile dToEnumerate("connection type", type)); |
| 2373 return; | 2373 return; |
| 2374 } | 2374 } |
| 2375 networkStateNotifier().setWebConnectionTypeForTest(webtype); | 2375 networkStateNotifier().setWebConnectionTypeForTest(webtype); |
| 2376 } | 2376 } |
| 2377 | 2377 |
| 2378 String Internals::serializeNavigationMarkup(Document* document, ExceptionState& exceptionState) | |
| 2379 { | |
| 2380 Vector<Document::TransitionElementData> elementData; | |
| 2381 frame()->document()->getTransitionElementData(&elementData, exceptionState); | |
|
esprehn
2014/06/13 08:47:06
pass vector by reference.
oystein (OOO til 10th of July)
2014/06/17 21:07:06
Done.
| |
| 2382 | |
| 2383 String markup; | |
| 2384 Vector<Document::TransitionElementData>::iterator iter = elementData.begin() ; | |
| 2385 for (; iter != elementData.end(); ++iter) { | |
| 2386 markup = markup + iter->markup; | |
| 2387 } | |
|
esprehn
2014/06/13 08:47:06
no braces.
oystein (OOO til 10th of July)
2014/06/17 21:07:06
Done.
| |
| 2388 | |
| 2389 return markup; | |
| 2390 } | |
| 2391 | |
| 2378 } // namespace WebCore | 2392 } // namespace WebCore |
| OLD | NEW |