content/shell/renderer/layout_test/blink_test_runner.cc - Issue 2928033002: Move GetDocument method from WebFrame to WebLocalFrame.

Unified Diff: content/shell/renderer/layout_test/blink_test_runner.cc

Issue 2928033002: Move GetDocument method from WebFrame to WebLocalFrame. (Closed)

Patch Set: Rebasing... Created 3 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/shell/renderer/layout_test/blink_test_runner.cc

diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc

index 91d0cfabf41e7a21ad60a2a91e08073ea9e48030..da5d9b7f88b68bd4526622d930e3ab7196bfda47 100644

--- a/content/shell/renderer/layout_test/blink_test_runner.cc

+++ b/content/shell/renderer/layout_test/blink_test_runner.cc

@@ -10,6 +10,7 @@

#include <clocale>

#include <cmath>

#include <memory>

+#include <string>

#include <utility>

#include "base/base64.h"

@@ -1046,7 +1047,8 @@ void BlinkTestRunner::OnTestFinishedInSecondaryRenderer() {

void BlinkTestRunner::OnTryLeakDetection() {

blink::WebFrame* main_frame = render_view()->GetWebView()->MainFrame();

- DCHECK_EQ(GURL(url::kAboutBlankURL), GURL(main_frame->GetDocument().Url()));

+ DCHECK_EQ(GURL(url::kAboutBlankURL),

+ url::Origin(main_frame->GetSecurityOrigin()).GetURL());

dcheng 2017/06/15 23:17:00 I'm a little surprised this works -- wouldn't the

Łukasz Anforowicz 2017/06/16 19:39:24 Oops - thanks for catching this. I didn't catch t

DCHECK(!main_frame->IsLoading());

leak_detector_->TryLeakDetection(main_frame);

Łukasz Anforowicz 2017/06/16 19:39:24 FWIW, the argument (i.e. |main_frame|) above is on

dcheng 2017/06/20 09:02:21 Yeah, seems odd. We probably need to go through an