| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "extensions/renderer/content_watcher.h" | 5 #include "extensions/renderer/content_watcher.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "content/public/renderer/render_view.h" | 9 #include "content/public/renderer/render_view.h" |
| 10 #include "content/public/renderer/render_view_visitor.h" | 10 #include "content/public/renderer/render_view_visitor.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 82 |
| 83 if (frame_selectors.empty()) | 83 if (frame_selectors.empty()) |
| 84 matching_selectors_.erase(frame); | 84 matching_selectors_.erase(frame); |
| 85 | 85 |
| 86 NotifyBrowserOfChange(frame); | 86 NotifyBrowserOfChange(frame); |
| 87 } | 87 } |
| 88 | 88 |
| 89 void ContentWatcher::NotifyBrowserOfChange( | 89 void ContentWatcher::NotifyBrowserOfChange( |
| 90 blink::WebLocalFrame* changed_frame) const { | 90 blink::WebLocalFrame* changed_frame) const { |
| 91 blink::WebFrame* const top_frame = changed_frame->top(); | 91 blink::WebFrame* const top_frame = changed_frame->top(); |
| 92 const blink::WebSecurityOrigin top_origin = top_frame->securityOrigin(); | 92 const blink::WebSecurityOrigin top_origin = top_frame->getSecurityOrigin(); |
| 93 // Want to aggregate matched selectors from all frames where an | 93 // Want to aggregate matched selectors from all frames where an |
| 94 // extension with access to top_origin could run on the frame. | 94 // extension with access to top_origin could run on the frame. |
| 95 if (!top_origin.canAccess(changed_frame->document().securityOrigin())) { | 95 if (!top_origin.canAccess(changed_frame->document().getSecurityOrigin())) { |
| 96 // If the changed frame can't be accessed by the top frame, then | 96 // If the changed frame can't be accessed by the top frame, then |
| 97 // no change in it could affect the set of selectors we'd send back. | 97 // no change in it could affect the set of selectors we'd send back. |
| 98 return; | 98 return; |
| 99 } | 99 } |
| 100 | 100 |
| 101 std::set<base::StringPiece> transitive_selectors; | 101 std::set<base::StringPiece> transitive_selectors; |
| 102 for (blink::WebFrame* frame = top_frame; frame; | 102 for (blink::WebFrame* frame = top_frame; frame; |
| 103 frame = frame->traverseNext(/*wrap=*/false)) { | 103 frame = frame->traverseNext(/*wrap=*/false)) { |
| 104 if (top_origin.canAccess(frame->securityOrigin())) { | 104 if (top_origin.canAccess(frame->getSecurityOrigin())) { |
| 105 std::map<blink::WebFrame*, std::set<std::string> >::const_iterator | 105 std::map<blink::WebFrame*, std::set<std::string> >::const_iterator |
| 106 frame_selectors = matching_selectors_.find(frame); | 106 frame_selectors = matching_selectors_.find(frame); |
| 107 if (frame_selectors != matching_selectors_.end()) { | 107 if (frame_selectors != matching_selectors_.end()) { |
| 108 transitive_selectors.insert(frame_selectors->second.begin(), | 108 transitive_selectors.insert(frame_selectors->second.begin(), |
| 109 frame_selectors->second.end()); | 109 frame_selectors->second.end()); |
| 110 } | 110 } |
| 111 } | 111 } |
| 112 } | 112 } |
| 113 std::vector<std::string> selector_strings; | 113 std::vector<std::string> selector_strings; |
| 114 for (std::set<base::StringPiece>::const_iterator it = | 114 for (std::set<base::StringPiece>::const_iterator it = |
| 115 transitive_selectors.begin(); | 115 transitive_selectors.begin(); |
| 116 it != transitive_selectors.end(); | 116 it != transitive_selectors.end(); |
| 117 ++it) | 117 ++it) |
| 118 selector_strings.push_back(it->as_string()); | 118 selector_strings.push_back(it->as_string()); |
| 119 content::RenderView* view = | 119 content::RenderView* view = |
| 120 content::RenderView::FromWebView(top_frame->view()); | 120 content::RenderView::FromWebView(top_frame->view()); |
| 121 view->Send(new ExtensionHostMsg_OnWatchedPageChange(view->GetRoutingID(), | 121 view->Send(new ExtensionHostMsg_OnWatchedPageChange(view->GetRoutingID(), |
| 122 selector_strings)); | 122 selector_strings)); |
| 123 } | 123 } |
| 124 | 124 |
| 125 } // namespace extensions | 125 } // namespace extensions |
| OLD | NEW |