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

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

Issue 13973026: remove memoryinstrumentation Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: remove the rest part of MemoryInstrumentation Created 7 years, 8 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 BeforeUnloadDismissal = 1, 267 BeforeUnloadDismissal = 1,
268 PageHideDismissal = 2, 268 PageHideDismissal = 2,
269 UnloadDismissal = 3 269 UnloadDismissal = 3
270 }; 270 };
271 PageDismissalType pageDismissalEventBeingDispatched() const { return m_pageD ismissalEventBeingDispatched; } 271 PageDismissalType pageDismissalEventBeingDispatched() const { return m_pageD ismissalEventBeingDispatched; }
272 272
273 NetworkingContext* networkingContext() const; 273 NetworkingContext* networkingContext() const;
274 274
275 const KURL& previousURL() const { return m_previousURL; } 275 const KURL& previousURL() const { return m_previousURL; }
276 276
277 void reportMemoryUsage(MemoryObjectInfo*) const;
278
279 private: 277 private:
280 enum FormSubmissionCacheLoadPolicy { 278 enum FormSubmissionCacheLoadPolicy {
281 MayAttemptCacheOnlyLoadForFormSubmissionItem, 279 MayAttemptCacheOnlyLoadForFormSubmissionItem,
282 MayNotAttemptCacheOnlyLoadForFormSubmissionItem 280 MayNotAttemptCacheOnlyLoadForFormSubmissionItem
283 }; 281 };
284 282
285 bool allChildrenAreComplete() const; // immediate children, not all descenda nts 283 bool allChildrenAreComplete() const; // immediate children, not all descenda nts
286 284
287 void checkTimerFired(Timer<FrameLoader>*); 285 void checkTimerFired(Timer<FrameLoader>*);
288 286
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 // the frame name references a frame different from the openerFrame, e.g. when i t is 432 // the frame name references a frame different from the openerFrame, e.g. when i t is
435 // "_self" or "_parent". 433 // "_self" or "_parent".
436 // 434 //
437 // FIXME: Consider making this function part of an appropriate class (not FrameL oader) 435 // FIXME: Consider making this function part of an appropriate class (not FrameL oader)
438 // and moving it to a more appropriate location. 436 // and moving it to a more appropriate location.
439 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created); 437 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque st&, const WindowFeatures&, bool& created);
440 438
441 } // namespace WebCore 439 } // namespace WebCore
442 440
443 #endif // FrameLoader_h 441 #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