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 * | 7 * |
8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
10 * are met: | 10 * are met: |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
237 Frame* frame = ownerElement->contentFrame(); | 237 Frame* frame = ownerElement->contentFrame(); |
238 if (frame) | 238 if (frame) |
239 frame->navigationScheduler()->scheduleLocationChange(m_frame->document()
->securityOrigin(), url.string(), m_frame->loader()->outgoingReferrer(), lockHis
tory, lockBackForwardList); | 239 frame->navigationScheduler()->scheduleLocationChange(m_frame->document()
->securityOrigin(), url.string(), m_frame->loader()->outgoingReferrer(), lockHis
tory, lockBackForwardList); |
240 else | 240 else |
241 frame = loadSubframe(ownerElement, url, frameName, m_frame->loader()->ou
tgoingReferrer()); | 241 frame = loadSubframe(ownerElement, url, frameName, m_frame->loader()->ou
tgoingReferrer()); |
242 return frame; | 242 return frame; |
243 } | 243 } |
244 | 244 |
245 Frame* SubframeLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const K
URL& url, const String& name, const String& referrer) | 245 Frame* SubframeLoader::loadSubframe(HTMLFrameOwnerElement* ownerElement, const K
URL& url, const String& name, const String& referrer) |
246 { | 246 { |
| 247 RefPtr<Frame> protect(m_frame); |
| 248 |
247 bool allowsScrolling = true; | 249 bool allowsScrolling = true; |
248 int marginWidth = -1; | 250 int marginWidth = -1; |
249 int marginHeight = -1; | 251 int marginHeight = -1; |
250 if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag
)) { | 252 if (ownerElement->hasTagName(frameTag) || ownerElement->hasTagName(iframeTag
)) { |
251 HTMLFrameElementBase* o = static_cast<HTMLFrameElementBase*>(ownerElemen
t); | 253 HTMLFrameElementBase* o = static_cast<HTMLFrameElementBase*>(ownerElemen
t); |
252 allowsScrolling = o->scrollingMode() != ScrollbarAlwaysOff; | 254 allowsScrolling = o->scrollingMode() != ScrollbarAlwaysOff; |
253 marginWidth = o->marginWidth(); | 255 marginWidth = o->marginWidth(); |
254 marginHeight = o->marginHeight(); | 256 marginHeight = o->marginHeight(); |
255 } | 257 } |
256 | 258 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 return true; | 379 return true; |
378 } | 380 } |
379 | 381 |
380 KURL SubframeLoader::completeURL(const String& url) const | 382 KURL SubframeLoader::completeURL(const String& url) const |
381 { | 383 { |
382 ASSERT(m_frame->document()); | 384 ASSERT(m_frame->document()); |
383 return m_frame->document()->completeURL(url); | 385 return m_frame->document()->completeURL(url); |
384 } | 386 } |
385 | 387 |
386 } // namespace WebCore | 388 } // namespace WebCore |
OLD | NEW |