Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e6778fe0
Commit
e6778fe0
authored
Sep 29, 2017
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 29, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Inherit document mode from parent document.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
af07789c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
0 deletions
+26
-0
htmldoc.c
dlls/mshtml/htmldoc.c
+9
-0
documentmode.js
dlls/mshtml/tests/documentmode.js
+17
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
e6778fe0
...
...
@@ -5044,6 +5044,15 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob
if
(
!
doc
)
return
E_OUTOFMEMORY
;
if
(
window
->
base
.
outer_window
->
parent
)
{
compat_mode_t
parent_mode
=
window
->
base
.
outer_window
->
parent
->
base
.
inner_window
->
doc
->
document_mode
;
TRACE
(
"parent mode %u
\n
"
,
parent_mode
);
if
(
parent_mode
>=
COMPAT_MODE_IE9
)
{
doc
->
document_mode_locked
=
TRUE
;
doc
->
document_mode
=
parent_mode
;
}
}
if
(
!
doc_obj
->
basedoc
.
window
||
window
->
base
.
outer_window
==
doc_obj
->
basedoc
.
window
)
doc
->
basedoc
.
cp_container
.
forward_container
=
&
doc_obj
->
basedoc
.
cp_container
;
...
...
dlls/mshtml/tests/documentmode.js
View file @
e6778fe0
...
...
@@ -99,6 +99,22 @@ function test_doc_mode() {
next_test
();
}
function
test_iframe_doc_mode
()
{
var
iframe
=
document
.
createElement
(
"iframe"
);
iframe
.
onload
=
function
()
{
var
iframe_mode
=
iframe
.
contentWindow
.
document
.
documentMode
;
if
(
document
.
documentMode
<
9
)
ok
(
iframe_mode
===
5
,
"iframe_mode = "
+
iframe_mode
);
else
ok
(
iframe_mode
===
document
.
documentMode
,
"iframe_mode = "
+
iframe_mode
);
next_test
();
}
iframe
.
src
=
"about:blank"
;
document
.
body
.
appendChild
(
iframe
);
}
function
test_conditional_comments
()
{
var
div
=
document
.
createElement
(
"div"
);
document
.
body
.
appendChild
(
div
);
...
...
@@ -137,6 +153,7 @@ function test_conditional_comments() {
var
tests
=
[
test_doc_mode
,
test_iframe_doc_mode
,
test_elem_props
,
test_doc_props
,
test_elem_by_id
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment