| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2010 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #include "core/html/DOMTokenList.h" | 64 #include "core/html/DOMTokenList.h" |
| 65 #include "core/html/DOMURL.h" | 65 #include "core/html/DOMURL.h" |
| 66 #include "core/html/HTMLFrameOwnerElement.h" | 66 #include "core/html/HTMLFrameOwnerElement.h" |
| 67 #include "core/inspector/InspectorInstrumentation.h" | 67 #include "core/inspector/InspectorInstrumentation.h" |
| 68 #include "core/inspector/ScriptCallStack.h" | 68 #include "core/inspector/ScriptCallStack.h" |
| 69 #include "core/loader/DocumentLoader.h" | 69 #include "core/loader/DocumentLoader.h" |
| 70 #include "core/loader/FrameLoadRequest.h" | 70 #include "core/loader/FrameLoadRequest.h" |
| 71 #include "core/loader/FrameLoader.h" | 71 #include "core/loader/FrameLoader.h" |
| 72 #include "core/loader/FrameLoaderClient.h" | 72 #include "core/loader/FrameLoaderClient.h" |
| 73 #include "core/loader/appcache/DOMApplicationCache.h" | 73 #include "core/loader/appcache/DOMApplicationCache.h" |
| 74 #include "core/page/BarInfo.h" | 74 #include "core/page/BarProp.h" |
| 75 #include "core/page/Chrome.h" | 75 #include "core/page/Chrome.h" |
| 76 #include "core/page/ChromeClient.h" | 76 #include "core/page/ChromeClient.h" |
| 77 #include "core/page/Console.h" | 77 #include "core/page/Console.h" |
| 78 #include "core/page/Crypto.h" | 78 #include "core/page/Crypto.h" |
| 79 #include "core/page/DOMPoint.h" | 79 #include "core/page/DOMPoint.h" |
| 80 #include "core/page/DOMSelection.h" | 80 #include "core/page/DOMSelection.h" |
| 81 #include "core/page/DOMTimer.h" | 81 #include "core/page/DOMTimer.h" |
| 82 #include "core/page/EventHandler.h" | 82 #include "core/page/EventHandler.h" |
| 83 #include "core/page/FocusController.h" | 83 #include "core/page/FocusController.h" |
| 84 #include "core/page/Frame.h" | 84 #include "core/page/Frame.h" |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 566 | 566 |
| 567 Crypto* DOMWindow::crypto() const | 567 Crypto* DOMWindow::crypto() const |
| 568 { | 568 { |
| 569 if (!isCurrentlyDisplayedInFrame()) | 569 if (!isCurrentlyDisplayedInFrame()) |
| 570 return 0; | 570 return 0; |
| 571 if (!m_crypto) | 571 if (!m_crypto) |
| 572 m_crypto = Crypto::create(); | 572 m_crypto = Crypto::create(); |
| 573 return m_crypto.get(); | 573 return m_crypto.get(); |
| 574 } | 574 } |
| 575 | 575 |
| 576 BarInfo* DOMWindow::locationbar() const | 576 BarProp* DOMWindow::locationbar() const |
| 577 { | 577 { |
| 578 if (!isCurrentlyDisplayedInFrame()) | 578 if (!isCurrentlyDisplayedInFrame()) |
| 579 return 0; | 579 return 0; |
| 580 if (!m_locationbar) | 580 if (!m_locationbar) |
| 581 m_locationbar = BarInfo::create(m_frame, BarInfo::Locationbar); | 581 m_locationbar = BarProp::create(m_frame, BarProp::Locationbar); |
| 582 return m_locationbar.get(); | 582 return m_locationbar.get(); |
| 583 } | 583 } |
| 584 | 584 |
| 585 BarInfo* DOMWindow::menubar() const | 585 BarProp* DOMWindow::menubar() const |
| 586 { | 586 { |
| 587 if (!isCurrentlyDisplayedInFrame()) | 587 if (!isCurrentlyDisplayedInFrame()) |
| 588 return 0; | 588 return 0; |
| 589 if (!m_menubar) | 589 if (!m_menubar) |
| 590 m_menubar = BarInfo::create(m_frame, BarInfo::Menubar); | 590 m_menubar = BarProp::create(m_frame, BarProp::Menubar); |
| 591 return m_menubar.get(); | 591 return m_menubar.get(); |
| 592 } | 592 } |
| 593 | 593 |
| 594 BarInfo* DOMWindow::personalbar() const | 594 BarProp* DOMWindow::personalbar() const |
| 595 { | 595 { |
| 596 if (!isCurrentlyDisplayedInFrame()) | 596 if (!isCurrentlyDisplayedInFrame()) |
| 597 return 0; | 597 return 0; |
| 598 if (!m_personalbar) | 598 if (!m_personalbar) |
| 599 m_personalbar = BarInfo::create(m_frame, BarInfo::Personalbar); | 599 m_personalbar = BarProp::create(m_frame, BarProp::Personalbar); |
| 600 return m_personalbar.get(); | 600 return m_personalbar.get(); |
| 601 } | 601 } |
| 602 | 602 |
| 603 BarInfo* DOMWindow::scrollbars() const | 603 BarProp* DOMWindow::scrollbars() const |
| 604 { | 604 { |
| 605 if (!isCurrentlyDisplayedInFrame()) | 605 if (!isCurrentlyDisplayedInFrame()) |
| 606 return 0; | 606 return 0; |
| 607 if (!m_scrollbars) | 607 if (!m_scrollbars) |
| 608 m_scrollbars = BarInfo::create(m_frame, BarInfo::Scrollbars); | 608 m_scrollbars = BarProp::create(m_frame, BarProp::Scrollbars); |
| 609 return m_scrollbars.get(); | 609 return m_scrollbars.get(); |
| 610 } | 610 } |
| 611 | 611 |
| 612 BarInfo* DOMWindow::statusbar() const | 612 BarProp* DOMWindow::statusbar() const |
| 613 { | 613 { |
| 614 if (!isCurrentlyDisplayedInFrame()) | 614 if (!isCurrentlyDisplayedInFrame()) |
| 615 return 0; | 615 return 0; |
| 616 if (!m_statusbar) | 616 if (!m_statusbar) |
| 617 m_statusbar = BarInfo::create(m_frame, BarInfo::Statusbar); | 617 m_statusbar = BarProp::create(m_frame, BarProp::Statusbar); |
| 618 return m_statusbar.get(); | 618 return m_statusbar.get(); |
| 619 } | 619 } |
| 620 | 620 |
| 621 BarInfo* DOMWindow::toolbar() const | 621 BarProp* DOMWindow::toolbar() const |
| 622 { | 622 { |
| 623 if (!isCurrentlyDisplayedInFrame()) | 623 if (!isCurrentlyDisplayedInFrame()) |
| 624 return 0; | 624 return 0; |
| 625 if (!m_toolbar) | 625 if (!m_toolbar) |
| 626 m_toolbar = BarInfo::create(m_frame, BarInfo::Toolbar); | 626 m_toolbar = BarProp::create(m_frame, BarProp::Toolbar); |
| 627 return m_toolbar.get(); | 627 return m_toolbar.get(); |
| 628 } | 628 } |
| 629 | 629 |
| 630 Console* DOMWindow::console() const | 630 Console* DOMWindow::console() const |
| 631 { | 631 { |
| 632 if (!isCurrentlyDisplayedInFrame()) | 632 if (!isCurrentlyDisplayedInFrame()) |
| 633 return 0; | 633 return 0; |
| 634 if (!m_console) | 634 if (!m_console) |
| 635 m_console = Console::create(m_frame); | 635 m_console = Console::create(m_frame); |
| 636 return m_console.get(); | 636 return m_console.get(); |
| (...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1862 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr
ame->view())); | 1862 WindowFeatures windowFeatures(dialogFeaturesString, screenAvailableRect(m_fr
ame->view())); |
| 1863 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, | 1863 Frame* dialogFrame = createWindow(urlString, emptyAtom, windowFeatures, |
| 1864 activeWindow, firstFrame, m_frame, function, functionContext); | 1864 activeWindow, firstFrame, m_frame, function, functionContext); |
| 1865 if (!dialogFrame) | 1865 if (!dialogFrame) |
| 1866 return; | 1866 return; |
| 1867 UserGestureIndicatorDisabler disabler; | 1867 UserGestureIndicatorDisabler disabler; |
| 1868 dialogFrame->page()->chrome()->runModal(); | 1868 dialogFrame->page()->chrome()->runModal(); |
| 1869 } | 1869 } |
| 1870 | 1870 |
| 1871 } // namespace WebCore | 1871 } // namespace WebCore |
| OLD | NEW |