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

Side by Side Diff: webkit/port/page/DOMWindow.idl

Issue 9627: mcHammer merge DOMWindow.idl ENABLE_DATABASE (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/chrome_webkit_merge_branch/src/
Patch Set: Created 12 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
Merged /branches/chrome_webkit_merge_branch/src/webkit/port/page/DOMWindow.idl:r3734-4217
Merged /trunk/src/webkit/port/page/DOMWindow.idl:r4618
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 136
137 // WebKit extensions 137 // WebKit extensions
138 CSSRuleList getMatchedCSSRules(in Element element, 138 CSSRuleList getMatchedCSSRules(in Element element,
139 in DOMString pseudoElement, 139 in DOMString pseudoElement,
140 in [Optional] boolean authorOnly); 140 in [Optional] boolean authorOnly);
141 attribute [Replaceable] double devicePixelRatio; 141 attribute [Replaceable] double devicePixelRatio;
142 142
143 #if ENABLE_OFFLINE_WEB_APPLICATIONS 143 #if ENABLE_OFFLINE_WEB_APPLICATIONS
144 readonly attribute DOMApplicationCache applicationCache; 144 readonly attribute DOMApplicationCache applicationCache;
145 #endif 145 #endif
146 #if ENABLE_DATABASE 146 #if 0 && ENABLE_DATABASE
147 // Temporarily disabled until database binding support for v8 is up to s nuff
147 Database openDatabase(in DOMString name, in DOMString version, in DOMStr ing displayName, in unsigned long estimatedSize) 148 Database openDatabase(in DOMString name, in DOMString version, in DOMStr ing displayName, in unsigned long estimatedSize)
148 raises(DOMException); 149 raises(DOMException);
149 #endif 150 #endif
150 #if ENABLE_DOM_STORAGE 151 #if ENABLE_DOM_STORAGE
151 readonly attribute Storage sessionStorage; 152 readonly attribute Storage sessionStorage;
152 readonly attribute Storage localStorage; 153 readonly attribute Storage localStorage;
153 #endif 154 #endif
154 155
155 attribute [Replaceable] Console console; 156 attribute [Replaceable] Console console;
156 157
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 attribute [Custom=DOMWindowEventHandler] DOMString onsubmit; 447 attribute [Custom=DOMWindowEventHandler] DOMString onsubmit;
447 attribute [Custom=DOMWindowEventHandler] DOMString onunload; 448 attribute [Custom=DOMWindowEventHandler] DOMString onunload;
448 attribute [Custom=DOMWindowEventHandler] DOMString onbeforeunload; 449 attribute [Custom=DOMWindowEventHandler] DOMString onbeforeunload;
449 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationstart; 450 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationstart;
450 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationiteratio n; 451 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationiteratio n;
451 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationend; 452 attribute [Custom=DOMWindowEventHandler] DOMString onwebkitanimationend;
452 attribute [Custom=DOMWindowEventHandler] DOMString onwebkittransitionend; 453 attribute [Custom=DOMWindowEventHandler] DOMString onwebkittransitionend;
453 #endif // defined(V8_BINDING) 454 #endif // defined(V8_BINDING)
454 }; 455 };
455 } 456 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698