diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:53:01 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 23:53:01 +0000 |
| commit | af886775b3f4888b60c1d379dd2b484ac0fa8833 (patch) | |
| tree | 6c58ceeaa2fa4d12b20d1e5f986bdee34ded6354 /content/test/data | |
| parent | 49306751db60b2437a17dcfcedd616c4d97e7ee8 (diff) | |
| download | chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.zip chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.tar.gz chromium_src-af886775b3f4888b60c1d379dd2b484ac0fa8833.tar.bz2 | |
Revert 157650 - 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.
Introduced too many static initializers - broke linux sizes.
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
Review URL: https://chromiumcodereview.appspot.com/10868012
TBR=lazyboy@chromium.org
Review URL: https://codereview.chromium.org/10946044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157656 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, 0 insertions, 74 deletions
diff --git a/content/test/data/browser_plugin_embedder.html b/content/test/data/browser_plugin_embedder.html deleted file mode 100644 index 31a7846..0000000 --- a/content/test/data/browser_plugin_embedder.html +++ /dev/null @@ -1,18 +0,0 @@ -<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 deleted file mode 100644 index fd066e5..0000000 --- a/content/test/data/browser_plugin_embedder_crash.html +++ /dev/null @@ -1,17 +0,0 @@ -<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 deleted file mode 100644 index 280de3c..0000000 --- a/content/test/data/browser_plugin_focus.html +++ /dev/null @@ -1,21 +0,0 @@ -<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 deleted file mode 100644 index 133fc0d..0000000 --- a/content/test/data/browser_plugin_focus_child.html +++ /dev/null @@ -1,6 +0,0 @@ -<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 deleted file mode 100644 index 0ad78e8a..0000000 --- a/content/test/data/browser_plugin_title_change.html +++ /dev/null @@ -1,12 +0,0 @@ -<html> - <head> - <script type="text/javascript"> - function SetTitle(title) { - document.title = title; - } - </script> - </head> - <body> - <script>SetTitle('done');</script> - </body> -</html> |