diff options
| author | sgjesse@chromium.org <sgjesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 10:11:32 +0000 |
|---|---|---|
| committer | sgjesse@chromium.org <sgjesse@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 10:11:32 +0000 |
| commit | 79b146165164583dbaedc285f97bdac966d04013 (patch) | |
| tree | 50c087194ae5b060995671fa7f945bd4d07a7968 /webkit/glue/webkit_glue.cc | |
| parent | 253601010dde1eae42992519244e8b3ffe5499b7 (diff) | |
| download | chromium_src-79b146165164583dbaedc285f97bdac966d04013.zip chromium_src-79b146165164583dbaedc285f97bdac966d04013.tar.gz chromium_src-79b146165164583dbaedc285f97bdac966d04013.tar.bz2 | |
Changed the DumpFramesAsText() to not dump anything about a frame if it is empty (has no root element). This matches the WebKit version function dumpFramesAsText in WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp, see http://trac.webkit.org/browser/trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp?rev=34719#L306.
This fixes layout test LayoutTests/http/tests/security/cross-origin-xsl-BLOCKED.html as it expects a totally empty iframe.
Review URL: http://codereview.chromium.org/10003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5099 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.cc')
| -rw-r--r-- | webkit/glue/webkit_glue.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc index 07b7057..a1e7272 100644 --- a/webkit/glue/webkit_glue.cc +++ b/webkit/glue/webkit_glue.cc @@ -129,8 +129,9 @@ std::wstring DumpFramesAsText(WebFrame* web_frame, bool recursive) { WebFrameImpl* webFrameImpl = static_cast<WebFrameImpl*>(web_frame); std::wstring result; - // Add header for all but the main frame. - if (webFrameImpl->GetParent()) { + // Add header for all but the main frame. Skip empty frames. + if (webFrameImpl->GetParent() && + webFrameImpl->frame()->document()->documentElement()) { result.append(L"\n--------\nFrame: '"); result.append(webFrameImpl->GetName()); result.append(L"'\n--------\n"); |