| 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 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 387 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht
tpHeaderField("X-DNS-Prefetch-Control"); | 387 const AtomicString& dnsPrefetchControl = m_documentLoader->response().ht
tpHeaderField("X-DNS-Prefetch-Control"); |
| 388 if (!dnsPrefetchControl.isEmpty()) | 388 if (!dnsPrefetchControl.isEmpty()) |
| 389 m_frame->document()->parseDNSPrefetchControlHeader(dnsPrefetchContro
l); | 389 m_frame->document()->parseDNSPrefetchControlHeader(dnsPrefetchContro
l); |
| 390 | 390 |
| 391 String headerContentLanguage = m_documentLoader->response().httpHeaderFi
eld("Content-Language"); | 391 String headerContentLanguage = m_documentLoader->response().httpHeaderFi
eld("Content-Language"); |
| 392 if (!headerContentLanguage.isEmpty()) { | 392 if (!headerContentLanguage.isEmpty()) { |
| 393 size_t commaIndex = headerContentLanguage.find(','); | 393 size_t commaIndex = headerContentLanguage.find(','); |
| 394 headerContentLanguage.truncate(commaIndex); // kNotFound == -1 == do
n't truncate | 394 headerContentLanguage.truncate(commaIndex); // kNotFound == -1 == do
n't truncate |
| 395 headerContentLanguage = headerContentLanguage.stripWhiteSpace(isHTML
Space<UChar>); | 395 headerContentLanguage = headerContentLanguage.stripWhiteSpace(isHTML
Space<UChar>); |
| 396 if (!headerContentLanguage.isEmpty()) | 396 if (!headerContentLanguage.isEmpty()) |
| 397 m_frame->document()->setContentLanguage(headerContentLanguage); | 397 m_frame->document()->setContentLanguage(AtomicString(headerConte
ntLanguage)); |
| 398 } | 398 } |
| 399 } | 399 } |
| 400 | 400 |
| 401 if (m_currentItem && m_loadType == FrameLoadTypeBackForward) | 401 if (m_currentItem && m_loadType == FrameLoadTypeBackForward) |
| 402 m_frame->document()->setStateForNewFormElements(m_currentItem->documentS
tate()); | 402 m_frame->document()->setStateForNewFormElements(m_currentItem->documentS
tate()); |
| 403 } | 403 } |
| 404 | 404 |
| 405 void FrameLoader::finishedParsing() | 405 void FrameLoader::finishedParsing() |
| 406 { | 406 { |
| 407 if (m_stateMachine.creatingInitialEmptyDocument()) | 407 if (m_stateMachine.creatingInitialEmptyDocument()) |
| (...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1567 { | 1567 { |
| 1568 SandboxFlags flags = m_forcedSandboxFlags; | 1568 SandboxFlags flags = m_forcedSandboxFlags; |
| 1569 if (Frame* parentFrame = m_frame->tree().parent()) | 1569 if (Frame* parentFrame = m_frame->tree().parent()) |
| 1570 flags |= parentFrame->document()->sandboxFlags(); | 1570 flags |= parentFrame->document()->sandboxFlags(); |
| 1571 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) | 1571 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) |
| 1572 flags |= ownerElement->sandboxFlags(); | 1572 flags |= ownerElement->sandboxFlags(); |
| 1573 return flags; | 1573 return flags; |
| 1574 } | 1574 } |
| 1575 | 1575 |
| 1576 } // namespace WebCore | 1576 } // namespace WebCore |
| OLD | NEW |