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

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

Issue 14787005: Simply FrameLoaderStateMachine and FrameLoader::transitionToCommitted(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merge to trunk for landing Created 7 years, 7 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
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 382
383 String m_outgoingReferrer; 383 String m_outgoingReferrer;
384 384
385 bool m_isExecutingJavaScriptFormAction; 385 bool m_isExecutingJavaScriptFormAction;
386 386
387 bool m_didCallImplicitClose; 387 bool m_didCallImplicitClose;
388 bool m_wasUnloadEventEmitted; 388 bool m_wasUnloadEventEmitted;
389 PageDismissalType m_pageDismissalEventBeingDispatched; 389 PageDismissalType m_pageDismissalEventBeingDispatched;
390 bool m_isComplete; 390 bool m_isComplete;
391 391
392 RefPtr<SerializedScriptValue> m_pendingStateObject;
393
394 bool m_needsClear; 392 bool m_needsClear;
395 393
396 KURL m_submittedFormURL; 394 KURL m_submittedFormURL;
397 395
398 Timer<FrameLoader> m_checkTimer; 396 Timer<FrameLoader> m_checkTimer;
399 bool m_shouldCallCheckCompleted; 397 bool m_shouldCallCheckCompleted;
400 bool m_shouldCallCheckLoadComplete; 398 bool m_shouldCallCheckLoadComplete;
401 399
402 Frame* m_opener; 400 Frame* m_opener;
403 HashSet<Frame*> m_openedFrames; 401 HashSet<Frame*> m_openedFrames;
(...skipping 15 matching lines...) Expand all
419 // the frame name references a frame different from the openerFrame, e.g. when i t is 417 // the frame name references a frame different from the openerFrame, e.g. when i t is
420 // "_self" or "_parent". 418 // "_self" or "_parent".
421 // 419 //
422 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 420 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
423 // and moving it to a more appropriate location. 421 // and moving it to a more appropriate location.
424 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 422 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
425 423
426 } // namespace WebCore 424 } // namespace WebCore
427 425
428 #endif // FrameLoader_h 426 #endif // FrameLoader_h
OLDNEW
« no previous file with comments | « Source/core/loader/DocumentLoader.cpp ('k') | Source/core/loader/FrameLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698