Changeset 26816 in webkit


Ignore:
Timestamp:
Oct 20, 2007 3:20:09 AM (17 years ago)
Author:
bdash
Message:

2007-10-20 Rodney Dawes <​dobey@wayofthemonkey.com>

Reviewd by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=15563
Fix conflict with X11 Window type in WebCore

  • WebCore/bindings/js/JSDocumentCustom.cpp:
  • WebCore/bindings/js/JSHTMLDocumentCustom.cpp:
  • WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp:
  • WebCore/bindings/js/kjs_dom.cpp:
  • WebCore/bindings/js/kjs_events.cpp:
  • WebCore/bindings/js/kjs_proxy.cpp:
  • WebCore/history/CachedPage.cpp:
  • WebCore/page/Chrome.cpp:
  • WebCore/page/Frame.cpp:
Location:
trunk/WebCore
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r26815 r26816  
     12007-10-20  Rodney Dawes  <dobey@wayofthemonkey.com>
     2
     3        Reviewd by Darin.
     4
     5        http://bugs.webkit.org/show_bug.cgi?id=15563
     6        Fix conflict with X11 Window type in WebCore
     7
     8        * WebCore/bindings/js/JSDocumentCustom.cpp:
     9        * WebCore/bindings/js/JSHTMLDocumentCustom.cpp:
     10        * WebCore/bindings/js/JSHTMLFrameSetElementCustom.cpp:
     11        * WebCore/bindings/js/kjs_dom.cpp:
     12        * WebCore/bindings/js/kjs_events.cpp:
     13        * WebCore/bindings/js/kjs_proxy.cpp:
     14        * WebCore/history/CachedPage.cpp:
     15        * WebCore/page/Chrome.cpp:
     16        * WebCore/page/Frame.cpp:
     17
    1182007-10-20  Simon Hausmann  <hausmann@kde.org>
    219

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

    r26499 r26816  
    5050        return jsNull();
    5151
    52     Window* win = Window::retrieveWindow(frame);
     52    KJS::Window* win = KJS::Window::retrieveWindow(frame);
    5353    ASSERT(win);
    5454    return win->location();
    … …  
    9595    // back/forward cache.
    9696    if (doc->frame())
    97         Window::retrieveWindow(doc->frame())->putDirect("document", ret, DontDelete|ReadOnly);
     97        KJS::Window::retrieveWindow(doc->frame())->putDirect("document", ret, DontDelete|ReadOnly);
    9898    else {
    9999        size_t nodeCount = 0;

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

    r26499 r26816  
    6565        Frame* frame;
    6666        if (node->hasTagName(iframeTag) && (frame = static_cast<HTMLIFrameElement*>(node)->contentFrame()))
    67             return Window::retrieve(frame);
     67            return KJS::Window::retrieve(frame);
    6868
    6969        return toJS(exec, node);
    … …  
    9898        Frame* frame = static_cast<HTMLDocument*>(impl())->frame();
    9999        if (frame) {
    100             Window* window = Window::retrieveWindow(frame);
     100            KJS::Window* window = KJS::Window::retrieveWindow(frame);
    101101            if (window) {
    102102                JSObject* functionObject = window->get(exec, "open")->getObject();

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

    r21979 r26816  
    5252    Node* frame = element->children()->namedItem(propertyName);
    5353    if (Document* doc = static_cast<HTMLFrameElement*>(frame)->contentDocument()) {
    54         if (Window* window = Window::retrieveWindow(doc->frame()))
     54        if (KJS::Window* window = KJS::Window::retrieveWindow(doc->frame()))
    5555            return window;
    5656    }

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

    r25754 r26816  
    6363
    6464  // Check to see if the currently executing interpreter is allowed to access the specified node
    65   Window* win = Window::retrieveWindow(n->document()->frame());
     65  KJS::Window* win = KJS::Window::retrieveWindow(n->document()->frame());
    6666  return win && win->isSafeScript(exec);
    6767}

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

    r25754 r26816  
    6767        return;
    6868
    69     Window* window = windowObj();
     69    KJS::Window* window = windowObj();
    7070    // Null check as clearWindowObj() can clear this and we still get called back by
    7171    // xmlhttprequest objects. See http://bugs.webkit.org/show_bug.cgi?id=13275
    … …  
    9898        args.append(toJS(exec, event));
    9999
    100         // Set the event we're handling in the Window object
     100        // Set the event we're handling in the KJS::Window object
    101101        window->setCurrentEvent(event);
    102102        // ... and in the interpreter
    … …  
    153153// -------------------------------------------------------------------------
    154154
    155 JSUnprotectedEventListener::JSUnprotectedEventListener(JSObject* listener, Window* win, bool html)
     155JSUnprotectedEventListener::JSUnprotectedEventListener(JSObject* listener, KJS::Window* win, bool html)
    156156    : JSAbstractEventListener(html)
    157157    , m_listener(listener)
    … …  
    159159{
    160160    if (m_listener) {
    161         Window::UnprotectedListenersMap& listeners = html
     161        KJS::Window::UnprotectedListenersMap& listeners = html
    162162            ? m_win->jsUnprotectedHTMLEventListeners() : m_win->jsUnprotectedEventListeners();
    163163        listeners.set(m_listener, this);
    … …  
    168168{
    169169    if (m_listener && m_win) {
    170         Window::UnprotectedListenersMap& listeners = isHTMLEventListener()
     170        KJS::Window::UnprotectedListenersMap& listeners = isHTMLEventListener()
    171171            ? m_win->jsUnprotectedHTMLEventListeners() : m_win->jsUnprotectedEventListeners();
    172172        listeners.remove(m_listener);
    … …  
    179179}
    180180
    181 Window* JSUnprotectedEventListener::windowObj() const
     181KJS::Window* JSUnprotectedEventListener::windowObj() const
    182182{
    183183    return m_win;
    … …  
    215215// -------------------------------------------------------------------------
    216216
    217 JSEventListener::JSEventListener(JSObject* listener, Window* win, bool html)
     217JSEventListener::JSEventListener(JSObject* listener, KJS::Window* win, bool html)
    218218    : JSAbstractEventListener(html)
    219219    , m_listener(listener)
    … …  
    221221{
    222222    if (m_listener) {
    223         Window::ListenersMap& listeners = html
     223        KJS::Window::ListenersMap& listeners = html
    224224            ? m_win->jsHTMLEventListeners() : m_win->jsEventListeners();
    225225        listeners.set(m_listener, this);
    … …  
    233233{
    234234    if (m_listener && m_win) {
    235         Window::ListenersMap& listeners = isHTMLEventListener()
     235        KJS::Window::ListenersMap& listeners = isHTMLEventListener()
    236236            ? m_win->jsHTMLEventListeners() : m_win->jsEventListeners();
    237237        listeners.remove(m_listener);
    … …  
    247247}
    248248
    249 Window* JSEventListener::windowObj() const
     249KJS::Window* JSEventListener::windowObj() const
    250250{
    251251    return m_win;
    … …  
    259259// -------------------------------------------------------------------------
    260260
    261 JSLazyEventListener::JSLazyEventListener(const String& functionName, const String& code, Window* win, Node* node, int lineNumber)
     261JSLazyEventListener::JSLazyEventListener(const String& functionName, const String& code, KJS::Window* win, Node* node, int lineNumber)
    262262    : JSEventListener(0, win, true)
    263263    , m_functionName(functionName)
    … …  
    335335
    336336    if (m_listener) {
    337         Window::ListenersMap& listeners = isHTMLEventListener()
     337        KJS::Window::ListenersMap& listeners = isHTMLEventListener()
    338338            ? windowObj()->jsHTMLEventListeners() : windowObj()->jsEventListeners();
    339339        listeners.set(m_listener, const_cast<JSLazyEventListener*>(this));

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

    r26074 r26816  
    8282    m_frame->keepAlive();
    8383   
    84     JSValue* thisNode = Window::retrieve(m_frame);
     84    JSValue* thisNode = KJS::Window::retrieve(m_frame);
    8585 
    8686    m_script->startTimeoutCheck();
    … …  
    104104void KJSProxy::clear() {
    105105  // clear resources allocated by the interpreter, and make it ready to be used by another page
    106   // We have to keep it, so that the Window object for the frame remains the same.
     106  // We have to keep it, so that the KJS::Window object for the frame remains the same.
    107107  // (we used to delete and re-create it, previously)
    108108  if (m_script) {
    109     Window *win = Window::retrieveWindow(m_frame);
     109    KJS::Window *win = KJS::Window::retrieveWindow(m_frame);
    110110    if (win)
    111111        win->clear();
    … …  
    117117    initScriptIfNeeded();
    118118    JSLock lock;
    119     return new JSLazyEventListener(functionName, code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
     119    return new JSLazyEventListener(functionName, code, KJS::Window::retrieveWindow(m_frame), node, m_handlerLineno);
    120120}
    121121
    … …  
    125125    initScriptIfNeeded();
    126126    JSLock lock;
    127     return new JSSVGLazyEventListener(functionName, code, Window::retrieveWindow(m_frame), node, m_handlerLineno);
     127    return new JSSVGLazyEventListener(functionName, code, KJS::Window::retrieveWindow(m_frame), node, m_handlerLineno);
    128128}
    129129#endif

  • trunk/WebCore/history/CachedPage.cpp

    r25397 r26816  
    8989    Frame* mainFrame = page->mainFrame();
    9090    KJSProxy* proxy = mainFrame->scriptProxy();
    91     Window* window = Window::retrieveWindow(mainFrame);
     91    KJS::Window* window = KJS::Window::retrieveWindow(mainFrame);
    9292
    9393    mainFrame->clearTimers();
    … …  
    125125    Frame* mainFrame = page->mainFrame();
    126126    KJSProxy* proxy = mainFrame->scriptProxy();
    127     Window* window = Window::retrieveWindow(mainFrame);
     127    KJS::Window* window = KJS::Window::retrieveWindow(mainFrame);
    128128
    129129    JSLock lock;

  • trunk/WebCore/page/Chrome.cpp

    r26787 r26816  
    370370#if !PLATFORM(MAC)
    371371            for (Frame* frame = otherPage->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
    372                 if (Window* window = Window::retrieveWindow(frame)) {
     372                if (KJS::Window* window = KJS::Window::retrieveWindow(frame)) {
    373373                    PausedTimeouts* timeouts = window->pauseTimeouts();
    374374
    … …  
    397397
    398398    for (size_t i = 0; i < count; i++) {
    399         Window* window = Window::retrieveWindow(m_pausedTimeouts[i].first.get());
     399        KJS::Window* window = KJS::Window::retrieveWindow(m_pausedTimeouts[i].first.get());
    400400        if (window)
    401401            window->resumeTimeouts(m_pausedTimeouts[i].second);

  • trunk/WebCore/page/Frame.cpp

    r26704 r26816  
    8585
    8686using KJS::JSLock;
    87 using KJS::Window;
    8887
    8988namespace WebCore {
    … …  
    195194
    196195    if (d->m_jscript && d->m_jscript->haveInterpreter())
    197         static_cast<Window*>(d->m_jscript->interpreter()->globalObject())->disconnectFrame();
     196        static_cast<KJS::Window*>(d->m_jscript->interpreter()->globalObject())->disconnectFrame();
    198197
    199198    disconnectOwnerElement();
    … …  
    17661765    // This will stop any JS timers
    17671766    if (d->m_jscript && d->m_jscript->haveInterpreter())
    1768         if (Window* w = Window::retrieveWindow(this))
     1767        if (KJS::Window* w = KJS::Window::retrieveWindow(this))
    17691768            w->disconnectFrame();
    17701769
Note: See TracChangeset for help on using the changeset viewer.