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

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

Issue 977113003: Rename renderer() to layoutObject(). (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/FindInPageCoordinates.cpp ('k') | Source/web/LinkHighlight.cpp » ('j') | 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) 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 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 RefPtrWillBeRawPtr<WebPluginContainerImpl> container = 752 RefPtrWillBeRawPtr<WebPluginContainerImpl> container =
753 WebPluginContainerImpl::create(element, webPlugin); 753 WebPluginContainerImpl::create(element, webPlugin);
754 754
755 if (!webPlugin->initialize(container.get())) { 755 if (!webPlugin->initialize(container.get())) {
756 #if ENABLE(OILPAN) 756 #if ENABLE(OILPAN)
757 container->dispose(); 757 container->dispose();
758 #endif 758 #endif
759 return nullptr; 759 return nullptr;
760 } 760 }
761 761
762 if (policy != AllowDetachedPlugin && !element->renderer()) { 762 if (policy != AllowDetachedPlugin && !element->layoutObject()) {
763 #if ENABLE(OILPAN) 763 #if ENABLE(OILPAN)
764 container->dispose(); 764 container->dispose();
765 #endif 765 #endif
766 return nullptr; 766 return nullptr;
767 } 767 }
768 768
769 return container; 769 return container;
770 } 770 }
771 771
772 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget( 772 PassRefPtrWillBeRawPtr<Widget> FrameLoaderClientImpl::createJavaAppletWidget(
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 949
950 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 950 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
951 { 951 {
952 if (m_webFrame->client()) { 952 if (m_webFrame->client()) {
953 m_webFrame->client()->suddenTerminationDisablerChanged( 953 m_webFrame->client()->suddenTerminationDisablerChanged(
954 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 954 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
955 } 955 }
956 } 956 }
957 957
958 } // namespace blink 958 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/FindInPageCoordinates.cpp ('k') | Source/web/LinkHighlight.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698