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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 #include "core/html/HTMLInputElement.h" | 111 #include "core/html/HTMLInputElement.h" |
112 #include "core/html/HTMLLinkElement.h" | 112 #include "core/html/HTMLLinkElement.h" |
113 #include "core/html/PluginDocument.h" | 113 #include "core/html/PluginDocument.h" |
114 #include "core/inspector/ConsoleMessage.h" | 114 #include "core/inspector/ConsoleMessage.h" |
115 #include "core/inspector/InspectorController.h" | 115 #include "core/inspector/InspectorController.h" |
116 #include "core/inspector/ScriptCallStack.h" | 116 #include "core/inspector/ScriptCallStack.h" |
117 #include "core/loader/DocumentLoader.h" | 117 #include "core/loader/DocumentLoader.h" |
118 #include "core/loader/FrameLoadRequest.h" | 118 #include "core/loader/FrameLoadRequest.h" |
119 #include "core/loader/FrameLoader.h" | 119 #include "core/loader/FrameLoader.h" |
120 #include "core/loader/HistoryItem.h" | 120 #include "core/loader/HistoryItem.h" |
| 121 #include "core/loader/MixedContentChecker.h" |
121 #include "core/loader/SubstituteData.h" | 122 #include "core/loader/SubstituteData.h" |
122 #include "core/page/Chrome.h" | 123 #include "core/page/Chrome.h" |
123 #include "core/page/EventHandler.h" | 124 #include "core/page/EventHandler.h" |
124 #include "core/page/FocusController.h" | 125 #include "core/page/FocusController.h" |
125 #include "core/page/FrameTree.h" | 126 #include "core/page/FrameTree.h" |
126 #include "core/page/Page.h" | 127 #include "core/page/Page.h" |
127 #include "core/page/PrintContext.h" | 128 #include "core/page/PrintContext.h" |
128 #include "core/rendering/HitTestResult.h" | 129 #include "core/rendering/HitTestResult.h" |
129 #include "core/rendering/RenderBox.h" | 130 #include "core/rendering/RenderBox.h" |
130 #include "core/rendering/RenderFrame.h" | 131 #include "core/rendering/RenderFrame.h" |
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
746 if (!frame()) | 747 if (!frame()) |
747 return; | 748 return; |
748 if (!frame()->settings()->scriptEnabled()) | 749 if (!frame()->settings()->scriptEnabled()) |
749 return; | 750 return; |
750 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); | 751 V8GCController::collectGarbage(v8::Isolate::GetCurrent()); |
751 } | 752 } |
752 | 753 |
753 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const | 754 bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const |
754 { | 755 { |
755 ASSERT(frame()); | 756 ASSERT(frame()); |
756 return frame()->loader().mixedContentChecker()->canFrameInsecureContent(fram
e()->document()->securityOrigin(), url); | 757 return !MixedContentChecker::shouldBlockFetch(frame(), WebURLRequest::Reques
tContextIframe, WebURLRequest::FrameTypeNested, url); |
757 } | 758 } |
758 | 759 |
759 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc
riptSource& source) | 760 v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebSc
riptSource& source) |
760 { | 761 { |
761 ASSERT(frame()); | 762 ASSERT(frame()); |
762 | 763 |
763 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); | 764 TextPosition position(OrdinalNumber::fromOneBasedInt(source.startLine), Ordi
nalNumber::first()); |
764 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource
Code(source.code, source.url, position)); | 765 return frame()->script().executeScriptInMainWorldAndReturnValue(ScriptSource
Code(source.code, source.url, position)); |
765 } | 766 } |
766 | 767 |
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1869 | 1870 |
1870 void WebLocalFrameImpl::invalidateAll() const | 1871 void WebLocalFrameImpl::invalidateAll() const |
1871 { | 1872 { |
1872 ASSERT(frame() && frame()->view()); | 1873 ASSERT(frame() && frame()->view()); |
1873 FrameView* view = frame()->view(); | 1874 FrameView* view = frame()->view(); |
1874 view->invalidateRect(view->frameRect()); | 1875 view->invalidateRect(view->frameRect()); |
1875 invalidateScrollbar(); | 1876 invalidateScrollbar(); |
1876 } | 1877 } |
1877 | 1878 |
1878 } // namespace blink | 1879 } // namespace blink |
OLD | NEW |