OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 4 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 5 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 7 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
8 * Copyright (C) 2011 Google Inc. All rights reserved. | 8 * Copyright (C) 2011 Google Inc. All rights reserved. |
9 * | 9 * |
10 * Redistribution and use in source and binary forms, with or without | 10 * Redistribution and use in source and binary forms, with or without |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 #include "ScriptCallStack.h" | 93 #include "ScriptCallStack.h" |
94 #include "ScriptController.h" | 94 #include "ScriptController.h" |
95 #include "ScriptSourceCode.h" | 95 #include "ScriptSourceCode.h" |
96 #include "ScrollAnimator.h" | 96 #include "ScrollAnimator.h" |
97 #include "SecurityOrigin.h" | 97 #include "SecurityOrigin.h" |
98 #include "SecurityPolicy.h" | 98 #include "SecurityPolicy.h" |
99 #include "SegmentedString.h" | 99 #include "SegmentedString.h" |
100 #include "SerializedScriptValue.h" | 100 #include "SerializedScriptValue.h" |
101 #include "Settings.h" | 101 #include "Settings.h" |
102 #include "TextResourceDecoder.h" | 102 #include "TextResourceDecoder.h" |
103 #include "WebCoreMemoryInstrumentation.h" | |
104 #include "WindowFeatures.h" | 103 #include "WindowFeatures.h" |
105 #include "XMLDocumentParser.h" | 104 #include "XMLDocumentParser.h" |
106 #include <wtf/CurrentTime.h> | 105 #include <wtf/CurrentTime.h> |
107 #include <wtf/MemoryInstrumentationHashSet.h> | |
108 #include <wtf/StdLibExtras.h> | 106 #include <wtf/StdLibExtras.h> |
109 #include <wtf/text/CString.h> | 107 #include <wtf/text/CString.h> |
110 #include <wtf/text/WTFString.h> | 108 #include <wtf/text/WTFString.h> |
111 | 109 |
112 #if ENABLE(SHARED_WORKERS) | 110 #if ENABLE(SHARED_WORKERS) |
113 #include "SharedWorkerRepository.h" | 111 #include "SharedWorkerRepository.h" |
114 #endif | 112 #endif |
115 | 113 |
116 #if ENABLE(SVG) | 114 #if ENABLE(SVG) |
117 #include "SVGDocument.h" | 115 #include "SVGDocument.h" |
(...skipping 2995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3113 ResourceRequest request(resource->url()); | 3111 ResourceRequest request(resource->url()); |
3114 m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(),
request, resource->response(), resource->encodedSize()); | 3112 m_client->dispatchDidLoadResourceFromMemoryCache(m_documentLoader.get(),
request, resource->response(), resource->encodedSize()); |
3115 } | 3113 } |
3116 } | 3114 } |
3117 | 3115 |
3118 NetworkingContext* FrameLoader::networkingContext() const | 3116 NetworkingContext* FrameLoader::networkingContext() const |
3119 { | 3117 { |
3120 return m_networkingContext.get(); | 3118 return m_networkingContext.get(); |
3121 } | 3119 } |
3122 | 3120 |
3123 void FrameLoader::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const | |
3124 { | |
3125 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::Loader); | |
3126 info.addMember(m_frame, "frame"); | |
3127 info.ignoreMember(m_client); | |
3128 info.addMember(m_progressTracker, "progressTracker"); | |
3129 info.addMember(m_documentLoader, "documentLoader"); | |
3130 info.addMember(m_provisionalDocumentLoader, "provisionalDocumentLoader"); | |
3131 info.addMember(m_policyDocumentLoader, "policyDocumentLoader"); | |
3132 info.addMember(m_pendingStateObject, "pendingStateObject"); | |
3133 info.addMember(m_submittedFormURL, "submittedFormURL"); | |
3134 info.addMember(m_checkTimer, "checkTimer"); | |
3135 info.addMember(m_opener, "opener"); | |
3136 info.addMember(m_openedFrames, "openedFrames"); | |
3137 info.addMember(m_outgoingReferrer, "outgoingReferrer"); | |
3138 info.addMember(m_networkingContext, "networkingContext"); | |
3139 info.addMember(m_previousURL, "previousURL"); | |
3140 info.addMember(m_requestedHistoryItem, "requestedHistoryItem"); | |
3141 } | |
3142 | |
3143 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque
st& request, const WindowFeatures& features, bool& created) | 3121 Frame* createWindow(Frame* openerFrame, Frame* lookupFrame, const FrameLoadReque
st& request, const WindowFeatures& features, bool& created) |
3144 { | 3122 { |
3145 ASSERT(!features.dialog || request.frameName().isEmpty()); | 3123 ASSERT(!features.dialog || request.frameName().isEmpty()); |
3146 | 3124 |
3147 if (!request.frameName().isEmpty() && request.frameName() != "_blank") { | 3125 if (!request.frameName().isEmpty() && request.frameName() != "_blank") { |
3148 if (Frame* frame = lookupFrame->loader()->findFrameForNavigation(request
.frameName(), openerFrame->document())) { | 3126 if (Frame* frame = lookupFrame->loader()->findFrameForNavigation(request
.frameName(), openerFrame->document())) { |
3149 if (Page* page = frame->page()) | 3127 if (Page* page = frame->page()) |
3150 page->chrome()->focus(); | 3128 page->chrome()->focus(); |
3151 created = false; | 3129 created = false; |
3152 return frame; | 3130 return frame; |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3214 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); | 3192 FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect); |
3215 | 3193 |
3216 page->chrome()->setWindowRect(newWindowRect); | 3194 page->chrome()->setWindowRect(newWindowRect); |
3217 page->chrome()->show(); | 3195 page->chrome()->show(); |
3218 | 3196 |
3219 created = true; | 3197 created = true; |
3220 return frame; | 3198 return frame; |
3221 } | 3199 } |
3222 | 3200 |
3223 } // namespace WebCore | 3201 } // namespace WebCore |
OLD | NEW |