- Revision
- 111552
- Author
- [email protected]
- Date
- 2012-03-21 09:36:34 -0700 (Wed, 21 Mar 2012)
Log Message
[Chromium] IndexedDB: Expose necessary IDB exception codes through WebKit API
https://bugs.webkit.org/show_bug.cgi?id=81597
To fix http://crbug.com/96826 and http://crbug.com/113118 we need to be able throw
exceptions from the Chromium side, so expose the necessary members of IDBDatabaseException.
Reviewed by Darin Fisher.
* WebKit.gyp:
* public/WebIDBDatabaseException.h: Added.
(WebKit):
* src/AssertMatchingEnums.cpp:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (111551 => 111552)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 16:33:12 UTC (rev 111551)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-21 16:36:34 UTC (rev 111552)
@@ -1,3 +1,18 @@
+2012-03-21 Joshua Bell <[email protected]>
+
+ [Chromium] IndexedDB: Expose necessary IDB exception codes through WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=81597
+
+ To fix http://crbug.com/96826 and http://crbug.com/113118 we need to be able throw
+ exceptions from the Chromium side, so expose the necessary members of IDBDatabaseException.
+
+ Reviewed by Darin Fisher.
+
+ * WebKit.gyp:
+ * public/WebIDBDatabaseException.h: Added.
+ (WebKit):
+ * src/AssertMatchingEnums.cpp:
+
2012-03-21 Tim Dresser <[email protected]>
[chromium] Increase size of Combo Box Options for touch and high DPI devices
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (111551 => 111552)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-21 16:33:12 UTC (rev 111551)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-03-21 16:36:34 UTC (rev 111552)
@@ -179,6 +179,7 @@
'public/WebIDBDatabase.h',
'public/WebIDBDatabaseCallbacks.h',
'public/WebIDBDatabaseError.h',
+ 'public/WebIDBDatabaseException.h',
'public/WebIDBFactory.h',
'public/WebIDBIndex.h',
'public/WebIDBKey.h',
Added: trunk/Source/WebKit/chromium/public/WebIDBDatabaseException.h (0 => 111552)
--- trunk/Source/WebKit/chromium/public/WebIDBDatabaseException.h (rev 0)
+++ trunk/Source/WebKit/chromium/public/WebIDBDatabaseException.h 2012-03-21 16:36:34 UTC (rev 111552)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebIDBDatabaseException_h
+#define WebIDBDatabaseException_h
+
+namespace WebKit {
+
+enum WebIDBDatabaseException {
+ WebIDBDatabaseExceptionDataError = 1205,
+ WebIDBDatabaseExceptionQuotaError = 1211,
+};
+
+} // namespace WebKit
+
+#endif // WebIDBDatabaseException_h
Modified: trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp (111551 => 111552)
--- trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-03-21 16:33:12 UTC (rev 111551)
+++ trunk/Source/WebKit/chromium/src/AssertMatchingEnums.cpp 2012-03-21 16:36:34 UTC (rev 111552)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2012 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -48,6 +48,7 @@
#include "GeolocationError.h"
#include "GeolocationPosition.h"
#include "HTMLInputElement.h"
+#include "IDBDatabaseException.h"
#include "IDBFactoryBackendInterface.h"
#include "IDBKey.h"
#include "IconURL.h"
@@ -78,6 +79,7 @@
#include "WebFontDescription.h"
#include "WebGeolocationError.h"
#include "WebGeolocationPosition.h"
+#include "WebIDBDatabaseException.h"
#include "WebIDBFactory.h"
#include "WebIDBKey.h"
#include "WebIconURL.h"
@@ -425,6 +427,9 @@
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInExistingDocuments, InjectInExistingDocuments);
COMPILE_ASSERT_MATCHING_ENUM(WebView::UserStyleInjectInSubsequentDocuments, InjectInSubsequentDocuments);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionDataError, IDBDatabaseException::DATA_ERR);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBDatabaseExceptionQuotaError, IDBDatabaseException::QUOTA_ERR);
+
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::InvalidType, IDBKey::InvalidType);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::ArrayType, IDBKey::ArrayType);
COMPILE_ASSERT_MATCHING_ENUM(WebIDBKey::StringType, IDBKey::StringType);
