| 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 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1624 webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name, | 1624 webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name, |
| 1625 uniqueName); | 1625 uniqueName); |
| 1626 // Initializing the core frame may cause the new child to be detached, since | 1626 // Initializing the core frame may cause the new child to be detached, since |
| 1627 // it may dispatch a load event in the parent. | 1627 // it may dispatch a load event in the parent. |
| 1628 if (!webframeChild->parent()) | 1628 if (!webframeChild->parent()) |
| 1629 return nullptr; | 1629 return nullptr; |
| 1630 | 1630 |
| 1631 // If we're moving in the back/forward list, we might want to replace the | 1631 // If we're moving in the back/forward list, we might want to replace the |
| 1632 // content of this child frame with whatever was there at that point. | 1632 // content of this child frame with whatever was there at that point. |
| 1633 HistoryItem* childItem = nullptr; | 1633 HistoryItem* childItem = nullptr; |
| 1634 if (isBackForwardLoadType(frame()->loader().loadType()) && | 1634 if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) && |
| 1635 !frame()->document()->loadEventFinished()) | 1635 !frame()->document()->loadEventFinished()) |
| 1636 childItem = webframeChild->client()->historyItemForNewChildFrame(); | 1636 childItem = webframeChild->client()->historyItemForNewChildFrame(); |
| 1637 | 1637 |
| 1638 FrameLoadRequest newRequest = request; | 1638 FrameLoadRequest newRequest = request; |
| 1639 FrameLoadType loadType = FrameLoadTypeStandard; | 1639 FrameLoadType loadType = FrameLoadTypeStandard; |
| 1640 if (childItem) { | 1640 if (childItem) { |
| 1641 newRequest = FrameLoadRequest( | 1641 newRequest = FrameLoadRequest( |
| 1642 request.originDocument(), | 1642 request.originDocument(), |
| 1643 FrameLoader::resourceRequestFromHistoryItem( | 1643 FrameLoader::resourceRequestFromHistoryItem( |
| 1644 childItem, WebCachePolicy::UseProtocolCachePolicy)); | 1644 childItem, WebCachePolicy::UseProtocolCachePolicy)); |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2377 ->frameScheduler() | 2377 ->frameScheduler() |
| 2378 ->unthrottledTaskRunner() | 2378 ->unthrottledTaskRunner() |
| 2379 ->toSingleThreadTaskRunner(); | 2379 ->toSingleThreadTaskRunner(); |
| 2380 } | 2380 } |
| 2381 | 2381 |
| 2382 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { | 2382 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { |
| 2383 return m_inputMethodController.get(); | 2383 return m_inputMethodController.get(); |
| 2384 } | 2384 } |
| 2385 | 2385 |
| 2386 } // namespace blink | 2386 } // namespace blink |
| OLD | NEW |