← Back to branch summary

~chrisccoulson/oxide/lp1504853

« back to all changes in this revision

Viewing changes to shared/browser/oxide_web_frame_tree.cc

  • Committer: Chris Coulson
  • Date: 2015-10-15 08:32:01 UTC
  • Revision ID: chris.coulson@canonical.com-20151015083201-r9m505zjdm3g605c
https://launchpad.net/bugs/1504853
Navigate to a placeholder transitional page for main frame certificate errors whilst waiting for a response

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_web_frame_tree.cc
53
53
 
54
54
  DCHECK(!WebFrame::FromRenderFrameHost(render_frame_host));
55
55
 
 
56
  if (!content::WebContents::FromRenderFrameHost(render_frame_host)) {
 
57
    // This is from an interstitial
 
58
    return;
 
59
  }
 
60
 
56
61
  if (render_frame_host->IsCrossProcessSubframe()) {
57
62
    // We should already have a WebFrame for this node
58
63
    return;
81
86
    return;
82
87
  }
83
88
 
 
89
  if (!content::WebContents::FromRenderFrameHost(old_host)) {
 
90
    // This is from an interstitial
 
91
    return;
 
92
  }
 
93
 
84
94
  WebFrame* frame = WebFrame::FromRenderFrameHost(old_host);
85
95
  DCHECK(frame);
86
96