diff options
| author | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 19:17:39 +0000 |
|---|---|---|
| committer | lazyboy@chromium.org <lazyboy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 19:17:39 +0000 |
| commit | 7a846df3cdb848d4f87ab52bbebf95d16660d494 (patch) | |
| tree | 1e2dc216f31a696da741e2833fd69ba97c61cf8f /content/test/data | |
| parent | 1aedaaa08397171253d1aa0a99951d96a52fe2a9 (diff) | |
| download | chromium_src-7a846df3cdb848d4f87ab52bbebf95d16660d494.zip chromium_src-7a846df3cdb848d4f87ab52bbebf95d16660d494.tar.gz chromium_src-7a846df3cdb848d4f87ab52bbebf95d16660d494.tar.bz2 | |
This is followup from Charlie's comments on Fady's cl: http://chromiumcodereview.appspot.com/10560022, it seems I cannot upload patch to that issue (since I'm not owner), I'm creating a new one.
Split Embedder and Guest 'roles' for browser plugin, web contents can now play any or both roles, main idea is to have more readable separation between the two.
Also stop creating browser_plugin counterpart in browser/host for every web_contents, instead create them only when there's a browser_plugin element.
BUG= 141232
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=157650
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=157773
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/10868012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/data')
| -rw-r--r-- | content/test/data/browser_plugin_embedder.html | 18 | ||||
| -rw-r--r-- | content/test/data/browser_plugin_embedder_crash.html | 17 | ||||
| -rw-r--r-- | content/test/data/browser_plugin_focus.html | 21 | ||||
| -rw-r--r-- | content/test/data/browser_plugin_focus_child.html | 6 | ||||
| -rw-r--r-- | content/test/data/browser_plugin_title_change.html | 12 |
5 files changed, 74 insertions, 0 deletions
diff --git a/content/test/data/browser_plugin_embedder.html b/content/test/data/browser_plugin_embedder.html new file mode 100644 index 0000000..31a7846 --- /dev/null +++ b/content/test/data/browser_plugin_embedder.html @@ -0,0 +1,18 @@ +<script type="text/javascript"> +function SetSrc(src) { + plugin = document.getElementById('plugin'); + plugin.src = src; +} +function SetSize(w, h) { + plugin = document.getElementById('plugin'); + plugin.width = w; + plugin.height = h; +} +</script> + +<object id="plugin" + tabindex="0" + type="application/new-browser-plugin" + width="640" + height="480" + border="0px"></object> diff --git a/content/test/data/browser_plugin_embedder_crash.html b/content/test/data/browser_plugin_embedder_crash.html new file mode 100644 index 0000000..fd066e5 --- /dev/null +++ b/content/test/data/browser_plugin_embedder_crash.html @@ -0,0 +1,17 @@ +<script type="text/javascript"> +function SetSrc(src) { + plugin = document.getElementById('plugin'); + plugin.src = src; +} +function SetSize(w, h) { + plugin = document.getElementById('plugin'); + plugin.width = w; + plugin.height = h; +} +</script> + +<!-- The plugin size is same as the browser's size --> +<object id="plugin" + tabindex="0" + type="application/new-browser-plugin" + style="height: 100%; width: 100%; border: 0px"></object> diff --git a/content/test/data/browser_plugin_focus.html b/content/test/data/browser_plugin_focus.html new file mode 100644 index 0000000..280de3c --- /dev/null +++ b/content/test/data/browser_plugin_focus.html @@ -0,0 +1,21 @@ +<html> +<head> +<script type="text/javascript"> + function SetSrc(src) { + plugin = document.getElementById('plugin'); + plugin.src = src; + } +</script> +</head> + +<body> + <button id="before" tabindex="0">Before</button> + <object id="plugin" + tabindex="0" + type="application/new-browser-plugin" + width="640" + height="480" + border="0px"></object> + <button id="after" tabindex="0">After</button> +</body> +</html> diff --git a/content/test/data/browser_plugin_focus_child.html b/content/test/data/browser_plugin_focus_child.html new file mode 100644 index 0000000..133fc0d --- /dev/null +++ b/content/test/data/browser_plugin_focus_child.html @@ -0,0 +1,6 @@ +<html> + <body> + <button id="before" tabindex="0">Before</button> + <button id="after" tabindex="0">After</button> + </body> +</html> diff --git a/content/test/data/browser_plugin_title_change.html b/content/test/data/browser_plugin_title_change.html new file mode 100644 index 0000000..0ad78e8a --- /dev/null +++ b/content/test/data/browser_plugin_title_change.html @@ -0,0 +1,12 @@ +<html> + <head> + <script type="text/javascript"> + function SetTitle(title) { + document.title = title; + } + </script> + </head> + <body> + <script>SetTitle('done');</script> + </body> +</html> |