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

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

Issue 2417783005: [Master/Overview CL] Make PageScaleFactor work for oopif subframe.
Patch Set: Rebase to master@{#429656}. Created 4 years, 1 month 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 extensionName, extensionGroup, worldId); 212 extensionName, extensionGroup, worldId);
213 213
214 return true; 214 return true;
215 } 215 }
216 216
217 void FrameLoaderClientImpl::didChangeScrollOffset() { 217 void FrameLoaderClientImpl::didChangeScrollOffset() {
218 if (m_webFrame->client()) 218 if (m_webFrame->client())
219 m_webFrame->client()->didChangeScrollOffset(m_webFrame); 219 m_webFrame->client()->didChangeScrollOffset(m_webFrame);
220 } 220 }
221 221
222 void FrameLoaderClientImpl::didRestorePageScaleFactorOnLoad(float pageScale) {
223 if (m_webFrame->client())
224 m_webFrame->client()->didRestorePageScaleFactorOnLoad(pageScale);
225 }
226
222 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() { 227 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() {
223 if (m_webFrame->client()) 228 if (m_webFrame->client())
224 m_webFrame->client()->didUpdateCurrentHistoryItem(); 229 m_webFrame->client()->didUpdateCurrentHistoryItem();
225 } 230 }
226 231
227 bool FrameLoaderClientImpl::allowScript(bool enabledPerSettings) { 232 bool FrameLoaderClientImpl::allowScript(bool enabledPerSettings) {
228 if (m_webFrame->contentSettingsClient()) 233 if (m_webFrame->contentSettingsClient())
229 return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings); 234 return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings);
230 235
231 return enabledPerSettings; 236 return enabledPerSettings;
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() { 980 WebDevToolsAgentImpl* FrameLoaderClientImpl::devToolsAgent() {
976 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot()) 981 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())
977 ->devToolsAgentImpl(); 982 ->devToolsAgentImpl();
978 } 983 }
979 984
980 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 985 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
981 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 986 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
982 } 987 }
983 988
984 } // namespace blink 989 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebPagePopupImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698