Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(347)

Side by Side Diff: third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

Issue 2653673006: Move loadType() to DocumentLoader (Closed)
Patch Set: Move loadType() to DocumentLoader Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name, 1602 webframeChild->initializeCoreFrame(frame()->host(), ownerElement, name,
1603 uniqueName); 1603 uniqueName);
1604 // Initializing the core frame may cause the new child to be detached, since 1604 // Initializing the core frame may cause the new child to be detached, since
1605 // it may dispatch a load event in the parent. 1605 // it may dispatch a load event in the parent.
1606 if (!webframeChild->parent()) 1606 if (!webframeChild->parent())
1607 return nullptr; 1607 return nullptr;
1608 1608
1609 // If we're moving in the back/forward list, we might want to replace the 1609 // If we're moving in the back/forward list, we might want to replace the
1610 // content of this child frame with whatever was there at that point. 1610 // content of this child frame with whatever was there at that point.
1611 HistoryItem* childItem = nullptr; 1611 HistoryItem* childItem = nullptr;
1612 if (isBackForwardLoadType(frame()->loader().loadType()) && 1612 if (isBackForwardLoadType(frame()->loader().documentLoader()->loadType()) &&
1613 !frame()->document()->loadEventFinished()) 1613 !frame()->document()->loadEventFinished())
1614 childItem = webframeChild->client()->historyItemForNewChildFrame(); 1614 childItem = webframeChild->client()->historyItemForNewChildFrame();
1615 1615
1616 FrameLoadRequest newRequest = request; 1616 FrameLoadRequest newRequest = request;
1617 FrameLoadType loadType = FrameLoadTypeStandard; 1617 FrameLoadType loadType = FrameLoadTypeStandard;
1618 if (childItem) { 1618 if (childItem) {
1619 newRequest = FrameLoadRequest( 1619 newRequest = FrameLoadRequest(
1620 request.originDocument(), 1620 request.originDocument(),
1621 FrameLoader::resourceRequestFromHistoryItem( 1621 FrameLoader::resourceRequestFromHistoryItem(
1622 childItem, WebCachePolicy::UseProtocolCachePolicy)); 1622 childItem, WebCachePolicy::UseProtocolCachePolicy));
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
2354 ->frameScheduler() 2354 ->frameScheduler()
2355 ->unthrottledTaskRunner() 2355 ->unthrottledTaskRunner()
2356 ->toSingleThreadTaskRunner(); 2356 ->toSingleThreadTaskRunner();
2357 } 2357 }
2358 2358
2359 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { 2359 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
2360 return m_inputMethodController.get(); 2360 return m_inputMethodController.get();
2361 } 2361 }
2362 2362
2363 } // namespace blink 2363 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698