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

Side by Side Diff: Source/WebCore/page/DOMWindow.idl

Issue 12317072: Merge 143386 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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 | « LayoutTests/fast/dom/MutationObserver/transient-gc-crash.html ('k') | no next file » | 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, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2011 Google Inc. All rights reserved. 3 * Copyright (C) 2011 Google Inc. All rights reserved.
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 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 #endif 792 #endif
793 793
794 attribute DOMFormDataConstructor FormData; 794 attribute DOMFormDataConstructor FormData;
795 795
796 [Conditional=BLOB|FILE_SYSTEM] attribute FileErrorConstructor FileError; 796 [Conditional=BLOB|FILE_SYSTEM] attribute FileErrorConstructor FileError;
797 [Conditional=BLOB] attribute FileReaderConstructor FileReader; 797 [Conditional=BLOB] attribute FileReaderConstructor FileReader;
798 798
799 [Conditional=BLOB] attribute DOMURLConstructor URL; 799 [Conditional=BLOB] attribute DOMURLConstructor URL;
800 [Conditional=BLOB] attribute DOMURLConstructor webkitURL; // FIXME: deprecat e this. 800 [Conditional=BLOB] attribute DOMURLConstructor webkitURL; // FIXME: deprecat e this.
801 801
802 attribute MutationObserverConstructor WebKitMutationObserver; 802 attribute MutationObserverConstructor WebKitMutationObserver; // FIXME: Add metrics to determine when we can remove this.
803 attribute MutationObserverConstructor MutationObserver;
803 804
804 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute MediaSo urceConstructor WebKitMediaSource; 805 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute MediaSo urceConstructor WebKitMediaSource;
805 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute SourceB ufferConstructor WebKitSourceBuffer; 806 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute SourceB ufferConstructor WebKitSourceBuffer;
806 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute SourceB ufferListConstructor WebKitSourceBufferList; 807 [Conditional=MEDIA_SOURCE, V8EnabledAtRuntime=mediaSource] attribute SourceB ufferListConstructor WebKitSourceBufferList;
807 808
808 #endif // defined(LANGUAGE_JAVASCRIPT) 809 #endif // defined(LANGUAGE_JAVASCRIPT)
809 810
810 #if defined(V8_BINDING) && V8_BINDING 811 #if defined(V8_BINDING) && V8_BINDING
811 // window.toString() requires special handling in V8 812 // window.toString() requires special handling in V8
812 [V8DoNotCheckSignature, DoNotCheckSecurity, Custom, NotEnumerable] DOMString toString(); 813 [V8DoNotCheckSignature, DoNotCheckSecurity, Custom, NotEnumerable] DOMString toString();
813 #endif // defined(V8_BINDING) 814 #endif // defined(V8_BINDING)
814 }; 815 };
815 816
OLDNEW
« no previous file with comments | « LayoutTests/fast/dom/MutationObserver/transient-gc-crash.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698