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

Side by Side Diff: webkit/api/src/FrameLoaderClientImpl.cpp

Issue 351013: Chrome changes to extract the code from V8Proxy that special-cases... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « webkit/api/src/FrameLoaderClientImpl.h ('k') | webkit/api/src/TemporaryGlue.h » ('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 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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 } 145 }
146 146
147 void FrameLoaderClientImpl::didPerformFirstNavigation() const 147 void FrameLoaderClientImpl::didPerformFirstNavigation() const
148 { 148 {
149 } 149 }
150 150
151 void FrameLoaderClientImpl::registerForIconNotification(bool) 151 void FrameLoaderClientImpl::registerForIconNotification(bool)
152 { 152 {
153 } 153 }
154 154
155 bool FrameLoaderClientImpl::allowJavaScript(bool enabledPerSettings)
156 {
157 if (m_webFrame->client())
158 return m_webFrame->client()->allowScript(m_webFrame, enabledPerSettings);
159
160 return enabledPerSettings;
161 }
162
155 bool FrameLoaderClientImpl::hasWebView() const 163 bool FrameLoaderClientImpl::hasWebView() const
156 { 164 {
157 return m_webFrame->viewImpl() != 0; 165 return m_webFrame->viewImpl() != 0;
158 } 166 }
159 167
160 bool FrameLoaderClientImpl::hasFrameView() const 168 bool FrameLoaderClientImpl::hasFrameView() const
161 { 169 {
162 // The Mac port has this notion of a WebFrameView, which seems to be 170 // The Mac port has this notion of a WebFrameView, which seems to be
163 // some wrapper around an NSView. Since our equivalent is HWND, I guess 171 // some wrapper around an NSView. Since our equivalent is HWND, I guess
164 // we have a "frameview" whenever we have the toplevel HWND. 172 // we have a "frameview" whenever we have the toplevel HWND.
(...skipping 1228 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 } 1401 }
1394 1402
1395 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver() 1403 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver()
1396 { 1404 {
1397 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader( 1405 WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
1398 m_webFrame->frame()->loader()->activeDocumentLoader()); 1406 m_webFrame->frame()->loader()->activeDocumentLoader());
1399 return ds->releasePluginLoadObserver(); 1407 return ds->releasePluginLoadObserver();
1400 } 1408 }
1401 1409
1402 } // namespace WebKit 1410 } // namespace WebKit
OLDNEW
« no previous file with comments | « webkit/api/src/FrameLoaderClientImpl.h ('k') | webkit/api/src/TemporaryGlue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698