diff options
| -rw-r--r-- | chrome/renderer/frame_sniffer.cc | 7 | ||||
| -rw-r--r-- | chrome/renderer/frame_sniffer.h | 5 | ||||
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/chrome/renderer/frame_sniffer.cc b/chrome/renderer/frame_sniffer.cc index 4546b68..20844b2 100644 --- a/chrome/renderer/frame_sniffer.cc +++ b/chrome/renderer/frame_sniffer.cc @@ -10,8 +10,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.h" FrameSniffer::FrameSniffer(content::RenderView* render_view, - const string16 &frame_name) - : content::RenderViewObserver(render_view), frame_name_(frame_name) { + const string16 &unique_frame_name) + : content::RenderViewObserver(render_view), + unique_frame_name_(unique_frame_name) { } FrameSniffer::~FrameSniffer() { @@ -32,5 +33,5 @@ void FrameSniffer::DidCommitProvisionalLoad(WebKit::WebFrame* frame, } bool FrameSniffer::ShouldSniffFrame(WebKit::WebFrame* frame) { - return frame->name() == frame_name_; + return frame->uniqueName() == unique_frame_name_; } diff --git a/chrome/renderer/frame_sniffer.h b/chrome/renderer/frame_sniffer.h index 4abc6da..c5c2316 100644 --- a/chrome/renderer/frame_sniffer.h +++ b/chrome/renderer/frame_sniffer.h @@ -13,7 +13,8 @@ // messages to be handled by RenderViewHostObserver. class FrameSniffer : public content::RenderViewObserver { public: - FrameSniffer(content::RenderView* render_view, const string16 &frame_name); + FrameSniffer(content::RenderView* render_view, + const string16 &unique_frame_name); virtual ~FrameSniffer(); // Implements RenderViewObserver. @@ -26,7 +27,7 @@ class FrameSniffer : public content::RenderViewObserver { bool ShouldSniffFrame(WebKit::WebFrame* frame); // Name of the frame to be monitored. - string16 frame_name_; + string16 unique_frame_name_; DISALLOW_COPY_AND_ASSIGN(FrameSniffer); }; diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 3ec193a..36584d1 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -119,7 +119,7 @@ string16 DumpFramesAsText(WebFrame* web_frame, bool recursive) { if (web_frame->parent() && !web_frame->document().documentElement().isNull()) { result.append(ASCIIToUTF16("\n--------\nFrame: '")); - result.append(web_frame->name()); + result.append(web_frame->uniqueName()); result.append(ASCIIToUTF16("'\n--------\n")); } @@ -162,7 +162,7 @@ string16 DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) { if (offset.width() > 0 || offset.height() > 0) { if (web_frame->parent()) { base::StringAppendF(&result_utf8, "frame '%s' ", - UTF16ToUTF8(web_frame->name()).c_str()); + UTF16ToUTF8(web_frame->uniqueName()).c_str()); } base::StringAppendF(&result_utf8, "scrolled to %d,%d\n", offset.width(), offset.height()); |