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

Side by Side Diff: bindings/js/JSDOMWindowCustom.cpp

Issue 113554: For local review prior to sending to webkit (Closed) Base URL: http://svn.webkit.org/repository/webkit/trunk/WebCore/
Patch Set: '' Created 11 years, 6 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
« no previous file with comments | « bindings/js/JSDOMApplicationCacheCustom.cpp ('k') | bindings/js/JSEventTarget.cpp » ('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) 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 markDOMObjectWrapper(globalData, impl()->optionalScreen()); 80 markDOMObjectWrapper(globalData, impl()->optionalScreen());
81 markDOMObjectWrapper(globalData, impl()->optionalScrollbars()); 81 markDOMObjectWrapper(globalData, impl()->optionalScrollbars());
82 markDOMObjectWrapper(globalData, impl()->optionalSelection()); 82 markDOMObjectWrapper(globalData, impl()->optionalSelection());
83 markDOMObjectWrapper(globalData, impl()->optionalStatusbar()); 83 markDOMObjectWrapper(globalData, impl()->optionalStatusbar());
84 markDOMObjectWrapper(globalData, impl()->optionalToolbar()); 84 markDOMObjectWrapper(globalData, impl()->optionalToolbar());
85 markDOMObjectWrapper(globalData, impl()->optionalLocation()); 85 markDOMObjectWrapper(globalData, impl()->optionalLocation());
86 #if ENABLE(DOM_STORAGE) 86 #if ENABLE(DOM_STORAGE)
87 markDOMObjectWrapper(globalData, impl()->optionalSessionStorage()); 87 markDOMObjectWrapper(globalData, impl()->optionalSessionStorage());
88 markDOMObjectWrapper(globalData, impl()->optionalLocalStorage()); 88 markDOMObjectWrapper(globalData, impl()->optionalLocalStorage());
89 #endif 89 #endif
90 #if ENABLE(OFFLINE_WEB_APPLICATIONS) 90 #if ENABLE(OFFLINE_WEB_APPLICATIONS) || ENABLE(APPLICATION_CACHE)
91 markDOMObjectWrapper(globalData, impl()->optionalApplicationCache()); 91 markDOMObjectWrapper(globalData, impl()->optionalApplicationCache());
92 #endif 92 #endif
93 } 93 }
94 94
95 bool JSDOMWindow::deleteProperty(ExecState* exec, const Identifier& propertyName ) 95 bool JSDOMWindow::deleteProperty(ExecState* exec, const Identifier& propertyName )
96 { 96 {
97 // Only allow deleting properties by frames in the same origin. 97 // Only allow deleting properties by frames in the same origin.
98 if (!allowsAccessFrom(exec)) 98 if (!allowsAccessFrom(exec))
99 return false; 99 return false;
100 return Base::deleteProperty(exec, propertyName); 100 return Base::deleteProperty(exec, propertyName);
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 return 0; 600 return 0;
601 JSObject* object = asObject(value); 601 JSObject* object = asObject(value);
602 if (object->inherits(&JSDOMWindow::s_info)) 602 if (object->inherits(&JSDOMWindow::s_info))
603 return static_cast<JSDOMWindow*>(object)->impl(); 603 return static_cast<JSDOMWindow*>(object)->impl();
604 if (object->inherits(&JSDOMWindowShell::s_info)) 604 if (object->inherits(&JSDOMWindowShell::s_info))
605 return static_cast<JSDOMWindowShell*>(object)->impl(); 605 return static_cast<JSDOMWindowShell*>(object)->impl();
606 return 0; 606 return 0;
607 } 607 }
608 608
609 } // namespace WebCore 609 } // namespace WebCore
OLDNEW
« no previous file with comments | « bindings/js/JSDOMApplicationCacheCustom.cpp ('k') | bindings/js/JSEventTarget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698