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

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

Issue 23464095: WTF::notFound looks too much like a local variable. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 3 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/CrossOriginPreflightResultCache.cpp ('k') | Source/core/page/Chrome.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, 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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 } 343 }
344 344
345 if (m_documentLoader) { 345 if (m_documentLoader) {
346 String dnsPrefetchControl = m_documentLoader->response().httpHeaderField ("X-DNS-Prefetch-Control"); 346 String dnsPrefetchControl = m_documentLoader->response().httpHeaderField ("X-DNS-Prefetch-Control");
347 if (!dnsPrefetchControl.isEmpty()) 347 if (!dnsPrefetchControl.isEmpty())
348 m_frame->document()->parseDNSPrefetchControlHeader(dnsPrefetchContro l); 348 m_frame->document()->parseDNSPrefetchControlHeader(dnsPrefetchContro l);
349 349
350 String headerContentLanguage = m_documentLoader->response().httpHeaderFi eld("Content-Language"); 350 String headerContentLanguage = m_documentLoader->response().httpHeaderFi eld("Content-Language");
351 if (!headerContentLanguage.isEmpty()) { 351 if (!headerContentLanguage.isEmpty()) {
352 size_t commaIndex = headerContentLanguage.find(','); 352 size_t commaIndex = headerContentLanguage.find(',');
353 headerContentLanguage.truncate(commaIndex); // notFound == -1 == don 't truncate 353 headerContentLanguage.truncate(commaIndex); // kNotFound == -1 == do n't truncate
354 headerContentLanguage = headerContentLanguage.stripWhiteSpace(isHTML Space); 354 headerContentLanguage = headerContentLanguage.stripWhiteSpace(isHTML Space);
355 if (!headerContentLanguage.isEmpty()) 355 if (!headerContentLanguage.isEmpty())
356 m_frame->document()->setContentLanguage(headerContentLanguage); 356 m_frame->document()->setContentLanguage(headerContentLanguage);
357 } 357 }
358 } 358 }
359 359
360 history()->restoreDocumentState(); 360 history()->restoreDocumentState();
361 } 361 }
362 362
363 void FrameLoader::finishedParsing() 363 void FrameLoader::finishedParsing()
(...skipping 1244 matching lines...) Expand 10 before | Expand all | Expand 10 after
1608 { 1608 {
1609 SandboxFlags flags = m_forcedSandboxFlags; 1609 SandboxFlags flags = m_forcedSandboxFlags;
1610 if (Frame* parentFrame = m_frame->tree()->parent()) 1610 if (Frame* parentFrame = m_frame->tree()->parent())
1611 flags |= parentFrame->document()->sandboxFlags(); 1611 flags |= parentFrame->document()->sandboxFlags();
1612 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement()) 1612 if (HTMLFrameOwnerElement* ownerElement = m_frame->ownerElement())
1613 flags |= ownerElement->sandboxFlags(); 1613 flags |= ownerElement->sandboxFlags();
1614 return flags; 1614 return flags;
1615 } 1615 }
1616 1616
1617 } // namespace WebCore 1617 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/loader/CrossOriginPreflightResultCache.cpp ('k') | Source/core/page/Chrome.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698