| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 4 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. | 5 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. |
| 6 * (http://www.torchmobile.com/) | 6 * (http://www.torchmobile.com/) |
| 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> | 7 * Copyright (C) 2008 Alp Toker <alp@atoker.com> |
| 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. | 8 * Copyright (C) Research In Motion Limited 2009. All rights reserved. |
| 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> | 9 * Copyright (C) 2011 Kris Jordan <krisjordan@gmail.com> |
| 10 * Copyright (C) 2011 Google Inc. All rights reserved. | 10 * Copyright (C) 2011 Google Inc. All rights reserved. |
| (...skipping 1496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1507 checkCompleted(); | 1507 checkCompleted(); |
| 1508 } | 1508 } |
| 1509 | 1509 |
| 1510 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, | 1510 bool FrameLoader::shouldPerformFragmentNavigation(bool isFormSubmission, |
| 1511 const String& httpMethod, | 1511 const String& httpMethod, |
| 1512 FrameLoadType loadType, | 1512 FrameLoadType loadType, |
| 1513 const KURL& url) { | 1513 const KURL& url) { |
| 1514 // We don't do this if we are submitting a form with method other than "GET", | 1514 // We don't do this if we are submitting a form with method other than "GET", |
| 1515 // explicitly reloading, currently displaying a frameset, or if the URL does | 1515 // explicitly reloading, currently displaying a frameset, or if the URL does |
| 1516 // not have a fragment. | 1516 // not have a fragment. |
| 1517 return (!isFormSubmission || equalIgnoringCase(httpMethod, HTTPNames::GET)) && | 1517 return equalIgnoringCase(httpMethod, HTTPNames::GET) && |
| 1518 !isReloadLoadType(loadType) && loadType != FrameLoadTypeBackForward && | 1518 !isReloadLoadType(loadType) && loadType != FrameLoadTypeBackForward && |
| 1519 url.hasFragmentIdentifier() && | 1519 url.hasFragmentIdentifier() && |
| 1520 equalIgnoringFragmentIdentifier(m_frame->document()->url(), url) | 1520 equalIgnoringFragmentIdentifier(m_frame->document()->url(), url) |
| 1521 // We don't want to just scroll if a link from within a frameset is | 1521 // We don't want to just scroll if a link from within a frameset is |
| 1522 // trying to reload the frameset into _top. | 1522 // trying to reload the frameset into _top. |
| 1523 && !m_frame->document()->isFrameSet(); | 1523 && !m_frame->document()->isFrameSet(); |
| 1524 } | 1524 } |
| 1525 | 1525 |
| 1526 void FrameLoader::processFragment(const KURL& url, | 1526 void FrameLoader::processFragment(const KURL& url, |
| 1527 LoadStartType loadStartType) { | 1527 LoadStartType loadStartType) { |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1927 m_documentLoader ? m_documentLoader->url() : String()); | 1927 m_documentLoader ? m_documentLoader->url() : String()); |
| 1928 return tracedValue; | 1928 return tracedValue; |
| 1929 } | 1929 } |
| 1930 | 1930 |
| 1931 inline void FrameLoader::takeObjectSnapshot() const { | 1931 inline void FrameLoader::takeObjectSnapshot() const { |
| 1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, | 1932 TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID("loading", "FrameLoader", this, |
| 1933 toTracedValue()); | 1933 toTracedValue()); |
| 1934 } | 1934 } |
| 1935 | 1935 |
| 1936 } // namespace blink | 1936 } // namespace blink |
| OLD | NEW |