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

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

Issue 2712033002: Part 1 Of Renaming FrameLoaderClient to LocalFrameClient. (Closed)
Patch Set: Change all forward declarations of FrameLoaderClient to LocalFrameClient and fix call sites. Created 3 years, 9 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 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1702 frame()->view()->setDisplayMode(webView->displayMode()); 1702 frame()->view()->setDisplayMode(webView->displayMode());
1703 } 1703 }
1704 1704
1705 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) { 1705 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame* frame) {
1706 if (!frame) 1706 if (!frame)
1707 return nullptr; 1707 return nullptr;
1708 return fromFrame(*frame); 1708 return fromFrame(*frame);
1709 } 1709 }
1710 1710
1711 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame& frame) { 1711 WebLocalFrameImpl* WebLocalFrameImpl::fromFrame(LocalFrame& frame) {
1712 FrameLoaderClient* client = frame.loader().client(); 1712 LocalFrameClient* client = frame.loader().client();
1713 if (!client || !client->isFrameLoaderClientImpl()) 1713 if (!client || !client->isLocalFrameClientImpl())
1714 return nullptr; 1714 return nullptr;
1715 return toFrameLoaderClientImpl(client)->webFrame(); 1715 return toLocalFrameClientImpl(client)->webFrame();
1716 } 1716 }
1717 1717
1718 WebLocalFrameImpl* WebLocalFrameImpl::fromFrameOwnerElement(Element* element) { 1718 WebLocalFrameImpl* WebLocalFrameImpl::fromFrameOwnerElement(Element* element) {
1719 if (!element->isFrameOwnerElement()) 1719 if (!element->isFrameOwnerElement())
1720 return nullptr; 1720 return nullptr;
1721 return fromFrame( 1721 return fromFrame(
1722 toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame())); 1722 toLocalFrame(toHTMLFrameOwnerElement(element)->contentFrame()));
1723 } 1723 }
1724 1724
1725 WebViewImpl* WebLocalFrameImpl::viewImpl() const { 1725 WebViewImpl* WebLocalFrameImpl::viewImpl() const {
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
2438 createMarkup(startPosition, endPosition, AnnotateForInterchange, 2438 createMarkup(startPosition, endPosition, AnnotateForInterchange,
2439 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2439 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2440 } else { 2440 } else {
2441 clipHtml = 2441 clipHtml =
2442 createMarkup(endPosition, startPosition, AnnotateForInterchange, 2442 createMarkup(endPosition, startPosition, AnnotateForInterchange,
2443 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); 2443 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
2444 } 2444 }
2445 } 2445 }
2446 2446
2447 } // namespace blink 2447 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698