Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: Source/core/page/DOMWindow.cpp

Issue 22802012: Rename DOMApplicationCache to ApplicationCache and expose it to JS (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove change to devtools and fix nits Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/page/DOMWindow.h ('k') | Source/core/page/Window.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 #include "core/dom/ScriptExecutionContext.h" 56 #include "core/dom/ScriptExecutionContext.h"
57 #include "core/editing/Editor.h" 57 #include "core/editing/Editor.h"
58 #include "core/history/BackForwardController.h" 58 #include "core/history/BackForwardController.h"
59 #include "core/html/HTMLFrameOwnerElement.h" 59 #include "core/html/HTMLFrameOwnerElement.h"
60 #include "core/inspector/InspectorInstrumentation.h" 60 #include "core/inspector/InspectorInstrumentation.h"
61 #include "core/inspector/ScriptCallStack.h" 61 #include "core/inspector/ScriptCallStack.h"
62 #include "core/loader/DocumentLoader.h" 62 #include "core/loader/DocumentLoader.h"
63 #include "core/loader/FrameLoadRequest.h" 63 #include "core/loader/FrameLoadRequest.h"
64 #include "core/loader/FrameLoader.h" 64 #include "core/loader/FrameLoader.h"
65 #include "core/loader/FrameLoaderClient.h" 65 #include "core/loader/FrameLoaderClient.h"
66 #include "core/loader/appcache/DOMApplicationCache.h" 66 #include "core/loader/appcache/ApplicationCache.h"
67 #include "core/page/BarProp.h" 67 #include "core/page/BarProp.h"
68 #include "core/page/Chrome.h" 68 #include "core/page/Chrome.h"
69 #include "core/page/ChromeClient.h" 69 #include "core/page/ChromeClient.h"
70 #include "core/page/Console.h" 70 #include "core/page/Console.h"
71 #include "core/page/CreateWindow.h" 71 #include "core/page/CreateWindow.h"
72 #include "core/page/DOMPoint.h" 72 #include "core/page/DOMPoint.h"
73 #include "core/page/DOMWindowLifecycleNotifier.h" 73 #include "core/page/DOMWindowLifecycleNotifier.h"
74 #include "core/page/EventHandler.h" 74 #include "core/page/EventHandler.h"
75 #include "core/page/Frame.h" 75 #include "core/page/Frame.h"
76 #include "core/page/FrameTree.h" 76 #include "core/page/FrameTree.h"
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 return m_console.get(); 587 return m_console.get();
588 } 588 }
589 589
590 PageConsole* DOMWindow::pageConsole() const 590 PageConsole* DOMWindow::pageConsole() const
591 { 591 {
592 if (!isCurrentlyDisplayedInFrame()) 592 if (!isCurrentlyDisplayedInFrame())
593 return 0; 593 return 0;
594 return m_frame->page() ? m_frame->page()->console() : 0; 594 return m_frame->page() ? m_frame->page()->console() : 0;
595 } 595 }
596 596
597 DOMApplicationCache* DOMWindow::applicationCache() const 597 ApplicationCache* DOMWindow::applicationCache() const
598 { 598 {
599 if (!isCurrentlyDisplayedInFrame()) 599 if (!isCurrentlyDisplayedInFrame())
600 return 0; 600 return 0;
601 if (!m_applicationCache) 601 if (!m_applicationCache)
602 m_applicationCache = DOMApplicationCache::create(m_frame); 602 m_applicationCache = ApplicationCache::create(m_frame);
603 return m_applicationCache.get(); 603 return m_applicationCache.get();
604 } 604 }
605 605
606 Navigator* DOMWindow::navigator() const 606 Navigator* DOMWindow::navigator() const
607 { 607 {
608 if (!isCurrentlyDisplayedInFrame()) 608 if (!isCurrentlyDisplayedInFrame())
609 return 0; 609 return 0;
610 if (!m_navigator) 610 if (!m_navigator)
611 m_navigator = Navigator::create(m_frame); 611 m_navigator = Navigator::create(m_frame);
612 return m_navigator.get(); 612 return m_navigator.get();
(...skipping 1148 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 return static_cast<DOMWindowLifecycleNotifier*>(LifecycleContext::lifecycleN otifier()); 1761 return static_cast<DOMWindowLifecycleNotifier*>(LifecycleContext::lifecycleN otifier());
1762 } 1762 }
1763 1763
1764 PassOwnPtr<LifecycleNotifier> DOMWindow::createLifecycleNotifier() 1764 PassOwnPtr<LifecycleNotifier> DOMWindow::createLifecycleNotifier()
1765 { 1765 {
1766 return DOMWindowLifecycleNotifier::create(this); 1766 return DOMWindowLifecycleNotifier::create(this);
1767 } 1767 }
1768 1768
1769 1769
1770 } // namespace WebCore 1770 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/DOMWindow.h ('k') | Source/core/page/Window.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698