Changeset 20972 in webkit


Ignore:
Timestamp:
Apr 20, 2007, 2:52:14 PM (18 years ago)
Author:
darin
Message:

LayoutTests:

Reviewed by Geoff Garen and John Sullivan.

  • test changes for <rdar://problem/4671964> document property on <iframe> elements causes problems for SAP application
  • fast/dom/iframe-document-expected.txt: Added.
  • fast/dom/iframe-document.html: Added.
  • fast/dom/attr_dead_doc.html: Changed to use contentDocument instead of relying on the document property on HTMLIFrameElement.
  • fast/events/mouseover-mouseout.html: Ditto.
  • fast/frames/repaint-display-none-crash.html: Ditto.

WebCore:

Reviewed by Geoff Garen and John Sullivan.

  • fix <rdar://problem/4671964> document property on <iframe> elements causes problems for SAP application

Test: fast/dom/iframe-document.html

  • bindings/js/kjs_html.h: Removed IFrameDocument.
  • bindings/js/kjs_html.cpp: (KJS::JSHTMLElement::iFrameGetter): Ditto.
Location:
trunk
Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r20963 r20972  
     12007-04-20  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Geoff Garen and John Sullivan.
     4
     5        - test changes for <rdar://problem/4671964> document property on <iframe> elements causes problems for SAP application
     6
     7        * fast/dom/iframe-document-expected.txt: Added.
     8        * fast/dom/iframe-document.html: Added.
     9
     10        * fast/dom/attr_dead_doc.html: Changed to use contentDocument instead of relying on the document property
     11        on HTMLIFrameElement.
     12        * fast/events/mouseover-mouseout.html: Ditto.
     13        * fast/frames/repaint-display-none-crash.html: Ditto.
     14
    1152007-04-19  Mitz Pettel  <mitz@webkit.org>
    216

  • trunk/LayoutTests/fast/dom/attr_dead_doc.html

    r12587 r20972  
    44var im;
    55function getImg() {
    6     im =  document.getElementById("right").document.getElementById("img");
     6    im =  document.getElementById("right").contentDocument.getElementById("img");
    77}
    88function setImg() {

  • trunk/LayoutTests/fast/events/mouseover-mouseout.html

    r13402 r20972  
    4646    onMouseOver="
    4747        logMouseEvent(event);
    48         newDoc = document.getElementById('invisible_frame').document;
    49         if (!newDoc)
    50             newDoc = document.getElementById('invisible_frame').contentDocument;
     48        newDoc = document.getElementById('invisible_frame').contentDocument;
    5149        try {
    5250            newDoc.adoptNode(document.getElementById('t3_1'));
    … …  
    6462    onMouseOver="
    6563        logMouseEvent(event);
    66         newDoc = document.getElementById('invisible_frame').document;
    67         if (!newDoc)
    68             newDoc = document.getElementById('invisible_frame').contentDocument;
     64        newDoc = document.getElementById('invisible_frame').contentDocument;
    6965        try {
    7066            newDoc.documentElement.appendChild(newDoc.adoptNode(document.getElementById('t4_1')));

  • trunk/LayoutTests/fast/frames/repaint-display-none-crash.html

    r15402 r20972  
    1111        t.style.display='none';
    1212        t.src='about:blank';
    13         t.document.body.offsetTop;
     13        t.contentDocument.body.offsetTop;
    1414        if (window.layoutTestController) {
    1515            layoutTestController.notifyDone();

  • trunk/WebCore/ChangeLog

    r20968 r20972  
     12007-04-20  Darin Adler  <darin@apple.com>
     2
     3        Reviewed by Geoff Garen and John Sullivan.
     4
     5        - fix <rdar://problem/4671964> document property on <iframe> elements causes problems for SAP application
     6
     7        Test: fast/dom/iframe-document.html
     8
     9        * bindings/js/kjs_html.h: Removed IFrameDocument.
     10        * bindings/js/kjs_html.cpp: (KJS::JSHTMLElement::iFrameGetter): Ditto.
     11
    1122007-04-19  Alp Toker  <alp@atoker.com>
    213

  • trunk/WebCore/bindings/js/kjs_html.cpp

    r20921 r20972  
    647647  contentDocument KJS::JSHTMLElement::IFrameContentDocument       DontDelete|ReadOnly
    648648  contentWindow   KJS::JSHTMLElement::IFrameContentWindow         DontDelete|ReadOnly
    649   document        KJS::JSHTMLElement::IFrameDocument              DontDelete|ReadOnly
    650649  frameBorder     KJS::JSHTMLElement::IFrameFrameBorder           DontDelete
    651650  height          KJS::JSHTMLElement::IFrameHeight                DontDelete
    … …  
    953952        case IFrameAlign:                return jsString(iFrame.align());
    954953          // ### security check ?
    955         case IFrameDocument: // non-standard, mapped to contentDocument
    956954        case IFrameContentDocument: return checkNodeSecurity(exec,iFrame.contentDocument()) ?
    957955                                      toJS(exec, iFrame.contentDocument()) : jsUndefined();

  • trunk/WebCore/bindings/js/kjs_html.h

    r19024 r20972  
    143143           FrameSetRows, FrameSrc, FrameLocation, FrameFrameBorder, FrameScrolling,
    144144           FrameMarginWidth, FrameLongDesc, FrameMarginHeight, FrameName, FrameContentDocument, FrameContentWindow,
    145            FrameNoResize, FrameWidth, FrameHeight, IFrameLongDesc, IFrameDocument, IFrameAlign,
     145           FrameNoResize, FrameWidth, FrameHeight, IFrameLongDesc, IFrameAlign,
    146146           IFrameFrameBorder, IFrameSrc, IFrameName, IFrameHeight,
    147147           IFrameMarginHeight, IFrameMarginWidth, IFrameScrolling, IFrameWidth, IFrameContentDocument, IFrameContentWindow,
Note: See TracChangeset for help on using the changeset viewer.