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

Side by Side Diff: Source/WebKit/chromium/src/WebFrameImpl.cpp

Issue 15294004: Implement V8ScriptRunner::compileAndRunInternalScript() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 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
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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after
845 845
846 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev el, message.text); 846 frame()->document()->addConsoleMessage(OtherMessageSource, webCoreMessageLev el, message.text);
847 } 847 }
848 848
849 void WebFrameImpl::collectGarbage() 849 void WebFrameImpl::collectGarbage()
850 { 850 {
851 if (!frame()) 851 if (!frame())
852 return; 852 return;
853 if (!frame()->settings()->isScriptEnabled()) 853 if (!frame()->settings()->isScriptEnabled())
854 return; 854 return;
855 V8GCController::collectGarbage(); 855 V8GCController::collectGarbage(v8::Isolate::GetCurrent());
856 } 856 }
857 857
858 bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const 858 bool WebFrameImpl::checkIfRunInsecureContent(const WebURL& url) const
859 { 859 {
860 ASSERT(frame()); 860 ASSERT(frame());
861 return frame()->loader()->mixedContentChecker()->canRunInsecureContent(frame ()->document()->securityOrigin(), url); 861 return frame()->loader()->mixedContentChecker()->canRunInsecureContent(frame ()->document()->securityOrigin(), url);
862 } 862 }
863 863
864 v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptS ource& source) 864 v8::Handle<v8::Value> WebFrameImpl::executeScriptAndReturnValue(const WebScriptS ource& source)
865 { 865 {
(...skipping 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after
2502 2502
2503 // There is a possibility that the frame being detached was the only 2503 // There is a possibility that the frame being detached was the only
2504 // pending one. We need to make sure final replies can be sent. 2504 // pending one. We need to make sure final replies can be sent.
2505 flushCurrentScopingEffort(m_findRequestIdentifier); 2505 flushCurrentScopingEffort(m_findRequestIdentifier);
2506 2506
2507 cancelPendingScopingEffort(); 2507 cancelPendingScopingEffort();
2508 } 2508 }
2509 } 2509 }
2510 2510
2511 } // namespace WebKit 2511 } // namespace WebKit
OLDNEW
« no previous file with comments | « no previous file | Source/bindings/v8/V8GCController.h » ('j') | Source/bindings/v8/V8ScriptRunner.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698