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