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

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

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 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
« no previous file with comments | « Source/core/testing/InternalSettings.cpp ('k') | Source/web/WebHelperPluginImpl.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 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 808 matching lines...) Expand 10 before | Expand all | Expand 10 after
819 return; 819 return;
820 } 820 }
821 821
822 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev el, message.text); 822 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev el, message.text);
823 } 823 }
824 824
825 void WebFrameImpl::collectGarbage() 825 void WebFrameImpl::collectGarbage()
826 { 826 {
827 if (!frame()) 827 if (!frame())
828 return; 828 return;
829 if (!frame()->settings()->isScriptEnabled()) 829 if (!frame()->settings()->scriptEnabled())
830 return; 830 return;
831 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); 831 V8GCController::collectGarbage(v8::Isolate::GetCurrent());
832 } 832 }
833 833
834 bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const 834 bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
835 { 835 {
836 ASSERT(frame()); 836 ASSERT(frame());
837 return frame()->loader().mixedContentChecker()->canRunInsecureContent(frame( )->document()->securityOrigin(), url); 837 return frame()->loader().mixedContentChecker()->canRunInsecureContent(frame( )->document()->securityOrigin(), url);
838 } 838 }
839 839
(...skipping 1649 matching lines...) Expand 10 before | Expand all | Expand 10 after
2489 2489
2490 // There is a possibility that the frame being detached was the only 2490 // There is a possibility that the frame being detached was the only
2491 // pending one. We need to make sure final replies can be sent. 2491 // pending one. We need to make sure final replies can be sent.
2492 flushCurrentScopingEffort(m_findRequestIdentifier); 2492 flushCurrentScopingEffort(m_findRequestIdentifier);
2493 2493
2494 cancelPendingScopingEffort(); 2494 cancelPendingScopingEffort();
2495 } 2495 }
2496 } 2496 }
2497 2497
2498 } // namespace blink 2498 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/testing/InternalSettings.cpp ('k') | Source/web/WebHelperPluginImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698