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

Side by Side Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2132283002: Use Document::validBaseElementURL to init preloadscanner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 2890 matching lines...) Expand 10 before | Expand all | Expand 10 after
2901 const KURL& newURL = url.isEmpty() ? blankURL() : url; 2901 const KURL& newURL = url.isEmpty() ? blankURL() : url;
2902 if (newURL == m_url) 2902 if (newURL == m_url)
2903 return; 2903 return;
2904 2904
2905 m_url = newURL; 2905 m_url = newURL;
2906 m_accessEntryFromURL = nullptr; 2906 m_accessEntryFromURL = nullptr;
2907 updateBaseURL(); 2907 updateBaseURL();
2908 contextFeatures().urlDidChange(this); 2908 contextFeatures().urlDidChange(this);
2909 } 2909 }
2910 2910
2911 KURL Document::validBaseElementURL() const
2912 {
2913 if (m_baseElementURL.isValid())
2914 return m_baseElementURL;
2915
2916 return KURL();
2917 }
2918
2911 void Document::updateBaseURL() 2919 void Document::updateBaseURL()
2912 { 2920 {
2913 KURL oldBaseURL = m_baseURL; 2921 KURL oldBaseURL = m_baseURL;
2914 // DOM 3 Core: When the Document supports the feature "HTML" [DOM Level 2 HT ML], the base URI is computed using 2922 // DOM 3 Core: When the Document supports the feature "HTML" [DOM Level 2 HT ML], the base URI is computed using
2915 // first the value of the href attribute of the HTML BASE element if any, an d the value of the documentURI attribute 2923 // first the value of the href attribute of the HTML BASE element if any, an d the value of the documentURI attribute
2916 // from the Document interface otherwise (which we store, preparsed, in m_ur l). 2924 // from the Document interface otherwise (which we store, preparsed, in m_ur l).
2917 if (!m_baseElementURL.isEmpty()) 2925 if (!m_baseElementURL.isEmpty())
2918 m_baseURL = m_baseElementURL; 2926 m_baseURL = m_baseElementURL;
2919 else if (!m_baseURLOverride.isEmpty()) 2927 else if (!m_baseURLOverride.isEmpty())
2920 m_baseURL = m_baseURLOverride; 2928 m_baseURL = m_baseURLOverride;
(...skipping 3109 matching lines...) Expand 10 before | Expand all | Expand 10 after
6030 } 6038 }
6031 6039
6032 void showLiveDocumentInstances() 6040 void showLiveDocumentInstances()
6033 { 6041 {
6034 WeakDocumentSet& set = liveDocumentSet(); 6042 WeakDocumentSet& set = liveDocumentSet();
6035 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 6043 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
6036 for (Document* document : set) 6044 for (Document* document : set)
6037 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data()); 6045 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().get String().utf8().data());
6038 } 6046 }
6039 #endif 6047 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Document.h ('k') | third_party/WebKit/Source/core/html/parser/HTMLDocumentParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698