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

Side by Side Diff: Source/core/loader/FrameLoader.h

Issue 18110006: Remove our logic to handle stopping a load inside startProvisionaLoad callbacks (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 3 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
4 * Copyright (C) Research In Motion Limited 2009. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2009. All rights reserved.
5 * Copyright (C) 2011 Google Inc. All rights reserved. 5 * Copyright (C) 2011 Google Inc. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 10 *
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 306
307 bool shouldReload(const KURL& currentURL, const KURL& destinationURL); 307 bool shouldReload(const KURL& currentURL, const KURL& destinationURL);
308 308
309 void requestFromDelegate(ResourceRequest&, unsigned long& identifier, Resour ceError&); 309 void requestFromDelegate(ResourceRequest&, unsigned long& identifier, Resour ceError&);
310 310
311 void detachChildren(); 311 void detachChildren();
312 void closeAndRemoveChild(Frame*); 312 void closeAndRemoveChild(Frame*);
313 313
314 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, bool isNewNavigation); 314 void loadInSameDocument(const KURL&, PassRefPtr<SerializedScriptValue> state Object, bool isNewNavigation);
315 315
316 void prepareForLoadStart();
317
318 bool didOpenURL(); 316 bool didOpenURL();
319 317
320 void scheduleCheckCompleted(); 318 void scheduleCheckCompleted();
321 void scheduleCheckLoadComplete(); 319 void scheduleCheckLoadComplete();
322 void startCheckCompleteTimer(); 320 void startCheckCompleteTimer();
323 321
324 bool shouldTreatURLAsSameAsCurrent(const KURL&) const; 322 bool shouldTreatURLAsSameAsCurrent(const KURL&) const;
325 323
326 Frame* m_frame; 324 Frame* m_frame;
327 FrameLoaderClient* m_client; 325 FrameLoaderClient* m_client;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 // the frame name references a frame different from the openerFrame, e.g. when i t is 384 // the frame name references a frame different from the openerFrame, e.g. when i t is
387 // "_self" or "_parent". 385 // "_self" or "_parent".
388 // 386 //
389 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 387 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
390 // and moving it to a more appropriate location. 388 // and moving it to a more appropriate location.
391 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 389 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
392 390
393 } // namespace WebCore 391 } // namespace WebCore
394 392
395 #endif // FrameLoader_h 393 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « LayoutTests/fast/loader/stop-provisional-loads-expected.txt ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698