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

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

Issue 2652643004: Make PageScaleFactor work for oopif subframes.
Patch Set: Put function prototype in correct place. Created 3 years, 10 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 void FrameLoaderClientImpl::didChangeScrollOffset() { 210 void FrameLoaderClientImpl::didChangeScrollOffset() {
211 if (m_webFrame->client()) 211 if (m_webFrame->client())
212 m_webFrame->client()->didChangeScrollOffset(m_webFrame); 212 m_webFrame->client()->didChangeScrollOffset(m_webFrame);
213 } 213 }
214 214
215 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() { 215 void FrameLoaderClientImpl::didUpdateCurrentHistoryItem() {
216 if (m_webFrame->client()) 216 if (m_webFrame->client())
217 m_webFrame->client()->didUpdateCurrentHistoryItem(); 217 m_webFrame->client()->didUpdateCurrentHistoryItem();
218 } 218 }
219 219
220 void FrameLoaderClientImpl::didRestorePageScaleFactorOnLoad(float pageScale) {
221 if (m_webFrame->client())
222 m_webFrame->client()->didRestorePageScaleFactorOnLoad(pageScale);
223 }
224
220 bool FrameLoaderClientImpl::allowScript(bool enabledPerSettings) { 225 bool FrameLoaderClientImpl::allowScript(bool enabledPerSettings) {
221 if (m_webFrame->contentSettingsClient()) 226 if (m_webFrame->contentSettingsClient())
222 return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings); 227 return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings);
223 228
224 return enabledPerSettings; 229 return enabledPerSettings;
225 } 230 }
226 231
227 bool FrameLoaderClientImpl::allowScriptFromSource(bool enabledPerSettings, 232 bool FrameLoaderClientImpl::allowScriptFromSource(bool enabledPerSettings,
228 const KURL& scriptURL) { 233 const KURL& scriptURL) {
229 if (m_webFrame->contentSettingsClient()) 234 if (m_webFrame->contentSettingsClient())
(...skipping 767 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) { 1002 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) {
998 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); 1003 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url));
999 } 1004 }
1000 1005
1001 void FrameLoaderClientImpl::setHasReceivedUserGesture() { 1006 void FrameLoaderClientImpl::setHasReceivedUserGesture() {
1002 if (m_webFrame->client()) 1007 if (m_webFrame->client())
1003 m_webFrame->client()->setHasReceivedUserGesture(); 1008 m_webFrame->client()->setHasReceivedUserGesture();
1004 } 1009 }
1005 1010
1006 } // namespace blink 1011 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/FrameLoaderClientImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698