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

Side by Side Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp

Issue 1983913002: Test to see if we can bring in document data from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: WebLocalFrameImpl::loadData Created 4 years, 7 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) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 if (m_webFrame->client()) 719 if (m_webFrame->client())
720 m_webFrame->client()->didObserveLoadingBehavior(behavior); 720 m_webFrame->client()->didObserveLoadingBehavior(behavior);
721 } 721 }
722 722
723 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors) 723 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors)
724 { 724 {
725 if (WebFrameClient* client = m_webFrame->client()) 725 if (WebFrameClient* client = m_webFrame->client())
726 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors)); 726 client->didMatchCSS(m_webFrame, WebVector<WebString>(addedSelectors), We bVector<WebString>(removedSelectors));
727 } 727 }
728 728
729 DocumentLoader* FrameLoaderClientImpl::createDocumentLoader(LocalFrame* frame, c onst ResourceRequest& request, const SubstituteData& data) 729 DocumentLoader* FrameLoaderClientImpl::createDocumentLoader(LocalFrame* frame, c onst ResourceRequest& request, const SubstituteData& data, int initiator)
730 { 730 {
731 WebDataSourceImpl* ds = WebDataSourceImpl::create(frame, request, data); 731 WebDataSourceImpl* ds = WebDataSourceImpl::create(frame, request, data);
732 if (m_webFrame->client()) 732 if (m_webFrame->client())
733 m_webFrame->client()->didCreateDataSource(m_webFrame, ds); 733 m_webFrame->client()->didCreateDataSource(m_webFrame, ds, initiator);
734 return ds; 734 return ds;
735 } 735 }
736 736
737 String FrameLoaderClientImpl::userAgent() 737 String FrameLoaderClientImpl::userAgent()
738 { 738 {
739 WebString override = m_webFrame->client() ? m_webFrame->client()->userAgentO verride() : ""; 739 WebString override = m_webFrame->client() ? m_webFrame->client()->userAgentO verride() : "";
740 if (!override.isEmpty()) 740 if (!override.isEmpty())
741 return override; 741 return override;
742 742
743 if (m_userAgent.isEmpty()) 743 if (m_userAgent.isEmpty())
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 } 1034 }
1035 1035
1036 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType() 1036 WebEffectiveConnectionType FrameLoaderClientImpl::getEffectiveConnectionType()
1037 { 1037 {
1038 if (m_webFrame->client()) 1038 if (m_webFrame->client())
1039 return m_webFrame->client()->getEffectiveConnectionType(); 1039 return m_webFrame->client()->getEffectiveConnectionType();
1040 return WebEffectiveConnectionType::TypeUnknown; 1040 return WebEffectiveConnectionType::TypeUnknown;
1041 } 1041 }
1042 1042
1043 } // namespace blink 1043 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698