| OLD | NEW |
| 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 832 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 843 v8::Local<v8::Value> result; | 843 v8::Local<v8::Value> result; |
| 844 if (!V8ScriptRunner::callFunction( | 844 if (!V8ScriptRunner::callFunction( |
| 845 function, frame()->document(), receiver, argc, | 845 function, frame()->document(), receiver, argc, |
| 846 static_cast<v8::Local<v8::Value>*>(argv), toIsolate(frame())) | 846 static_cast<v8::Local<v8::Value>*>(argv), toIsolate(frame())) |
| 847 .ToLocal(&result)) | 847 .ToLocal(&result)) |
| 848 return v8::Local<v8::Value>(); | 848 return v8::Local<v8::Value>(); |
| 849 return result; | 849 return result; |
| 850 } | 850 } |
| 851 | 851 |
| 852 v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const { | 852 v8::Local<v8::Context> WebLocalFrameImpl::mainWorldScriptContext() const { |
| 853 ScriptState* scriptState = ScriptState::forMainWorld(frame()); | 853 ScriptState* scriptState = toScriptStateForMainWorld(frame()); |
| 854 DCHECK(scriptState); | 854 DCHECK(scriptState); |
| 855 return scriptState->context(); | 855 return scriptState->context(); |
| 856 } | 856 } |
| 857 | 857 |
| 858 bool WebFrame::scriptCanAccess(WebFrame* target) { | 858 bool WebFrame::scriptCanAccess(WebFrame* target) { |
| 859 return BindingSecurity::shouldAllowAccessToFrame( | 859 return BindingSecurity::shouldAllowAccessToFrame( |
| 860 currentDOMWindow(mainThreadIsolate()), target->toImplBase()->frame(), | 860 currentDOMWindow(mainThreadIsolate()), target->toImplBase()->frame(), |
| 861 BindingSecurity::ErrorReportOption::DoNotReport); | 861 BindingSecurity::ErrorReportOption::DoNotReport); |
| 862 } | 862 } |
| 863 | 863 |
| (...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2514 createMarkup(startPosition, endPosition, AnnotateForInterchange, | 2514 createMarkup(startPosition, endPosition, AnnotateForInterchange, |
| 2515 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2515 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2516 } else { | 2516 } else { |
| 2517 clipHtml = | 2517 clipHtml = |
| 2518 createMarkup(endPosition, startPosition, AnnotateForInterchange, | 2518 createMarkup(endPosition, startPosition, AnnotateForInterchange, |
| 2519 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); | 2519 ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs); |
| 2520 } | 2520 } |
| 2521 } | 2521 } |
| 2522 | 2522 |
| 2523 } // namespace blink | 2523 } // namespace blink |
| OLD | NEW |