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

Side by Side Diff: Source/WebCore/dom/Document.cpp

Issue 11786012: Merge 138918 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 7 years, 11 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
« no previous file with comments | « LayoutTests/fast/dom/window-load-crash-expected.txt ('k') | no next file » | 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 2444 matching lines...) Expand 10 before | Expand all | Expand 10 after
2455 m_closeAfterStyleRecalc = true; 2455 m_closeAfterStyleRecalc = true;
2456 return; 2456 return;
2457 } 2457 }
2458 2458
2459 bool wasLocationChangePending = frame() && frame()->navigationScheduler()->l ocationChangePending(); 2459 bool wasLocationChangePending = frame() && frame()->navigationScheduler()->l ocationChangePending();
2460 bool doload = !parsing() && m_parser && !m_processingLoadEvent && !wasLocati onChangePending; 2460 bool doload = !parsing() && m_parser && !m_processingLoadEvent && !wasLocati onChangePending;
2461 2461
2462 if (!doload) 2462 if (!doload)
2463 return; 2463 return;
2464 2464
2465 // Call to dispatchWindowLoadEvent can blow us from underneath.
2466 RefPtr<Document> protect(this);
2467
2465 m_processingLoadEvent = true; 2468 m_processingLoadEvent = true;
2466 2469
2467 ScriptableDocumentParser* parser = scriptableDocumentParser(); 2470 ScriptableDocumentParser* parser = scriptableDocumentParser();
2468 m_wellFormed = parser && parser->wellFormed(); 2471 m_wellFormed = parser && parser->wellFormed();
2469 2472
2470 // We have to clear the parser, in case someone document.write()s from the 2473 // We have to clear the parser, in case someone document.write()s from the
2471 // onLoad event handler, as in Radar 3206524. 2474 // onLoad event handler, as in Radar 3206524.
2472 detachParser(); 2475 detachParser();
2473 2476
2474 // Parser should have picked up all preloads by now 2477 // Parser should have picked up all preloads by now
(...skipping 3564 matching lines...) Expand 10 before | Expand all | Expand 10 after
6039 AtomicString localeKey = locale; 6042 AtomicString localeKey = locale;
6040 if (locale.isEmpty() || !RuntimeEnabledFeatures::langAttributeAwareFormContr olUIEnabled()) 6043 if (locale.isEmpty() || !RuntimeEnabledFeatures::langAttributeAwareFormContr olUIEnabled())
6041 localeKey = defaultLanguage(); 6044 localeKey = defaultLanguage();
6042 LocaleIdentifierToLocaleMap::AddResult result = m_localeCache.add(localeKey, nullptr); 6045 LocaleIdentifierToLocaleMap::AddResult result = m_localeCache.add(localeKey, nullptr);
6043 if (result.isNewEntry) 6046 if (result.isNewEntry)
6044 result.iterator->value = Locale::create(localeKey); 6047 result.iterator->value = Locale::create(localeKey);
6045 return *(result.iterator->value); 6048 return *(result.iterator->value);
6046 } 6049 }
6047 6050
6048 } // namespace WebCore 6051 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/window-load-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698