OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
7 * met: | 7 * met: |
8 * | 8 * |
9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
77 #include "bindings/v8/ScriptController.h" | 77 #include "bindings/v8/ScriptController.h" |
78 #include "core/dom/UserGestureIndicator.h" | 78 #include "core/dom/UserGestureIndicator.h" |
79 #include "core/page/Settings.h" | 79 #include "core/page/Settings.h" |
80 #include "core/page/WindowFeatures.h" | 80 #include "core/page/WindowFeatures.h" |
81 #include "core/platform/chromium/support/WrappedResourceRequest.h" | 81 #include "core/platform/chromium/support/WrappedResourceRequest.h" |
82 #include "core/platform/chromium/support/WrappedResourceResponse.h" | 82 #include "core/platform/chromium/support/WrappedResourceResponse.h" |
83 #include "core/platform/network/SocketStreamHandleInternal.h" | 83 #include "core/platform/network/SocketStreamHandleInternal.h" |
84 #include "public/platform/Platform.h" | 84 #include "public/platform/Platform.h" |
85 #include "public/platform/WebMimeRegistry.h" | 85 #include "public/platform/WebMimeRegistry.h" |
86 #include "public/platform/WebSocketStreamHandle.h" | 86 #include "public/platform/WebSocketStreamHandle.h" |
87 #include "public/platform/WebThread.h" | |
abarth-chromium
2013/07/12 23:44:11
Why do you need this header? I don't see anything
Jeffrey Yasskin
2013/07/16 00:38:51
I don't. Gone.
| |
87 #include "public/platform/WebURL.h" | 88 #include "public/platform/WebURL.h" |
88 #include "public/platform/WebURLError.h" | 89 #include "public/platform/WebURLError.h" |
89 #include "public/platform/WebVector.h" | 90 #include "public/platform/WebVector.h" |
90 #include "wtf/StringExtras.h" | 91 #include "wtf/StringExtras.h" |
91 #include "wtf/text/CString.h" | 92 #include "wtf/text/CString.h" |
92 #include "wtf/text/WTFString.h" | 93 #include "wtf/text/WTFString.h" |
93 | 94 |
94 using namespace WebCore; | 95 using namespace WebCore; |
95 | 96 |
96 namespace WebKit { | 97 namespace WebKit { |
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
616 if (m_webFrame->client()) | 617 if (m_webFrame->client()) |
617 m_webFrame->client()->didRunInsecureContent(m_webFrame, WebSecurityOrigi n(origin), insecureURL); | 618 m_webFrame->client()->didRunInsecureContent(m_webFrame, WebSecurityOrigi n(origin), insecureURL); |
618 } | 619 } |
619 | 620 |
620 void FrameLoaderClientImpl::didDetectXSS(const KURL& insecureURL, bool didBlockE ntirePage) | 621 void FrameLoaderClientImpl::didDetectXSS(const KURL& insecureURL, bool didBlockE ntirePage) |
621 { | 622 { |
622 if (m_webFrame->client()) | 623 if (m_webFrame->client()) |
623 m_webFrame->client()->didDetectXSS(m_webFrame, insecureURL, didBlockEnti rePage); | 624 m_webFrame->client()->didDetectXSS(m_webFrame, insecureURL, didBlockEnti rePage); |
624 } | 625 } |
625 | 626 |
627 void FrameLoaderClientImpl::selectorMatchChanged(const Vector<String>& addedSele ctors, const Vector<String>& removedSelectors) | |
628 { | |
629 if (m_webFrame->client()) { | |
630 m_webFrame->client()->didMatchCss(m_webFrame, WebVector<WebString>(added Selectors), WebVector<WebString>(removedSelectors)); | |
631 } | |
632 } | |
633 | |
626 ResourceError FrameLoaderClientImpl::cancelledError(const ResourceRequest& reque st) | 634 ResourceError FrameLoaderClientImpl::cancelledError(const ResourceRequest& reque st) |
627 { | 635 { |
628 if (!m_webFrame->client()) | 636 if (!m_webFrame->client()) |
629 return ResourceError(); | 637 return ResourceError(); |
630 | 638 |
631 return m_webFrame->client()->cancelledError( | 639 return m_webFrame->client()->cancelledError( |
632 m_webFrame, WrappedResourceRequest(request)); | 640 m_webFrame, WrappedResourceRequest(request)); |
633 } | 641 } |
634 | 642 |
635 ResourceError FrameLoaderClientImpl::cannotShowURLError(const ResourceRequest& r equest) | 643 ResourceError FrameLoaderClientImpl::cannotShowURLError(const ResourceRequest& r equest) |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
927 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason); | 935 m_webFrame->client()->didLoseWebGLContext(m_webFrame, arbRobustnessConte xtLostReason); |
928 } | 936 } |
929 | 937 |
930 void FrameLoaderClientImpl::dispatchWillInsertBody() | 938 void FrameLoaderClientImpl::dispatchWillInsertBody() |
931 { | 939 { |
932 if (m_webFrame->client()) | 940 if (m_webFrame->client()) |
933 m_webFrame->client()->willInsertBody(m_webFrame); | 941 m_webFrame->client()->willInsertBody(m_webFrame); |
934 } | 942 } |
935 | 943 |
936 } // namespace WebKit | 944 } // namespace WebKit |
OLD | NEW |