summaryrefslogtreecommitdiffstats
path: root/components/test
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-07-29 12:39:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-29 19:40:06 +0000
commitc59968f3fb14e124b8f05e77983f485f33b5d5f1 (patch)
tree19cf8479cc9927e13d461d7781b08d7ef79c32f2 /components/test
parent134fccf1b3d33f7dd28cd8c0c498bb059fc50ea9 (diff)
downloadchromium_src-c59968f3fb14e124b8f05e77983f485f33b5d5f1.zip
chromium_src-c59968f3fb14e124b8f05e77983f485f33b5d5f1.tar.gz
chromium_src-c59968f3fb14e124b8f05e77983f485f33b5d5f1.tar.bz2
Makes it possible for an html frame tree to have numerous local frames
When a frame is navigated we immediately swap it to remote and then call Embed(). It's possible Embed() will callback to the same app, in which case we need to convert the frame from remote to local. This change does this. The result of this change is that HTMLFrame implements FrameTreeClient and forwards to HTMLFrameTreeManager. HTMLFrameTreeManager may end up containing multiple local frames, each having it's own connection. HTMLFrameTreeManager is destroyed only when the root is destroyed, or there are no more local roots. The code would likely be cleaner if the blink parts were separated out and HTMLFrame* were effectively a client lib. I'll consider that once I get everything working smoothly. BUG=479172,490221 TEST=covered by tests R=ben@chromium.org Review URL: https://codereview.chromium.org/1254973006 Cr-Commit-Position: refs/heads/master@{#340954}
Diffstat (limited to 'components/test')
-rw-r--r--components/test/data/html_viewer/empty_page2.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/components/test/data/html_viewer/empty_page2.html b/components/test/data/html_viewer/empty_page2.html
new file mode 100644
index 0000000..a5786ef
--- /dev/null
+++ b/components/test/data/html_viewer/empty_page2.html
@@ -0,0 +1,5 @@
+<html>
+ <body style="background-color: red">
+ child
+ </body>
+</html>