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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
747 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const | 747 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const |
748 { | 748 { |
749 ASSERT(frame()); | 749 ASSERT(frame()); |
750 return frame()->loader().mixedContentChecker()->canFrameInsecureContent(fram
e()->document()->securityOrigin(), url); | 750 return frame()->loader().mixedContentChecker()->canFrameInsecureContent(fram
e()->document()->securityOrigin(), url); |
751 } | 751 } |
752 | 752 |
753 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc
riptSource& source) | 753 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc
riptSource& source) |
754 { | 754 { |
755 ASSERT(frame()); | 755 ASSERT(frame()); |
756 | 756 |
757 // FIXME: This fake user gesture is required to make a bunch of pyauto | 757 // TODO: Remove this after blink has rolled and chromium change landed. (crr
ev.com/516753002) |
758 // tests pass. If this isn't needed in non-test situations, we should | |
759 // consider removing this code and changing the tests. | |
760 // http://code.google.com/p/chromium/issues/detail?id=86397 | |
761 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); | 758 UserGestureIndicator gestureIndicator(DefinitelyProcessingNewUserGesture); |
762 | 759 |
763 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); | 760 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); |
764 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource
Code(source.code, source.url, position)); | 761 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource
Code(source.code, source.url, position)); |
765 } | 762 } |
766 | 763 |
767 void WebLocalFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScrip
tSource* sourcesIn, unsigned numSources, int extensionGroup, WebVector<v8::Local
<v8::Value> >* results) | 764 void WebLocalFrameImpl::executeScriptInIsolatedWorld(int worldID, const WebScrip
tSource* sourcesIn, unsigned numSources, int extensionGroup, WebVector<v8::Local
<v8::Value> >* results) |
768 { | 765 { |
769 ASSERT(frame()); | 766 ASSERT(frame()); |
770 RELEASE_ASSERT(worldID > 0); | 767 RELEASE_ASSERT(worldID > 0); |
(...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1859 | 1856 |
1860 void WebLocalFrameImpl::invalidateAll() const | 1857 void WebLocalFrameImpl::invalidateAll() const |
1861 { | 1858 { |
1862 ASSERT(frame() && frame()->view()); | 1859 ASSERT(frame() && frame()->view()); |
1863 FrameView* view = frame()->view(); | 1860 FrameView* view = frame()->view(); |
1864 view->invalidateRect(view->frameRect()); | 1861 view->invalidateRect(view->frameRect()); |
1865 invalidateScrollbar(); | 1862 invalidateScrollbar(); |
1866 } | 1863 } |
1867 | 1864 |
1868 } // namespace blink | 1865 } // namespace blink |
OLD | NEW |