Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 94742
Collapse All | Expand All

(-)khtml/ecma/kjs_window.cpp.orig (-3 / +16 lines)
Lines 483-492 Value Window::get(ExecState *exec, const Link Here
483
  }
483
  }
484
484
485
  // Look for overrides first
485
  // Look for overrides first
486
  Value val = ObjectImp::get(exec, p);
486
  ValueImp *val = getDirect(p);
487
  if (!val.isA(UndefinedType)) {
487
  if (val) {
488
    //kdDebug(6070) << "Window::get found dynamic property '" << p.ascii() << "'" << endl;
488
    //kdDebug(6070) << "Window::get found dynamic property '" << p.ascii() << "'" << endl;
489
    return isSafeScript(exec) ? val : Undefined();
489
    return isSafeScript(exec) ? Value(val) : Undefined();
490
  }
490
  }
491
491
492
  const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
492
  const HashEntry* entry = Lookup::findEntry(&WindowTable, p);
Lines 753-758 Value Window::get(ExecState *exec, const Link Here
753
      return getListener(exec,DOM::EventImpl::UNLOAD_EVENT);
753
      return getListener(exec,DOM::EventImpl::UNLOAD_EVENT);
754
    }
754
    }
755
  }
755
  }
756
757
  // doing the remainder of ObjectImp::get() that is not covered by
758
  // the getDirect() call above.
759
  // #### guessed position. move further up or down?
760
  Object proto = Object::dynamicCast(prototype());
761
  assert(proto.isValid());
762
  if (p == specialPrototypePropertyName)
763
    return isSafeScript(exec) ? Value(proto) : Undefined();
764
  Value val2 = proto.get(exec, p);
765
  if (!val2.isA(UndefinedType)) {
766
    return isSafeScript(exec) ? val2 : Undefined();
767
  }
768
756
  KParts::ReadOnlyPart *rop = part->findFramePart( p.qstring() );
769
  KParts::ReadOnlyPart *rop = part->findFramePart( p.qstring() );
757
  if (rop)
770
  if (rop)
758
    return retrieve(rop);
771
    return retrieve(rop);

Return to bug 94742