Title: [136099] trunk/Source/WebKit2
- Revision
- 136099
- Author
- wei...@apple.com
- Date
- 2012-11-28 22:24:18 -0800 (Wed, 28 Nov 2012)
Log Message
IndexedDB: Remove duplicate toWireString() and createFromWire() methods in JSC SerializedScriptValue
https://bugs.webkit.org/show_bug.cgi?id=103554
Patch by Michael Pruett <mich...@68k.org> on 2012-11-28
Reviewed by Kentaro Hara.
In r135022, duplicate createFromWire() and toWireString() methods
were added to the JSC version of SerializedScriptValue. In
order to allow the JSC SerializedScriptValue to compile when
ENABLE(INDEXED_DATABASE) is turned on, these new methods have
been removed and the old methods have been moved outside the
ENABLE(INDEXED_DATABASE) guard.
* win/WebKit2.def:
* win/WebKit2CFLite.def:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (136098 => 136099)
--- trunk/Source/WebKit2/ChangeLog 2012-11-29 06:23:58 UTC (rev 136098)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-29 06:24:18 UTC (rev 136099)
@@ -17,6 +17,14 @@
2012-11-28 Sam Weinig <s...@webkit.org>
+ Fix 32bit build.
+
+ * Shared/mac/ObjCObjectGraphCoders.mm:
+ (WebKit::WebContextObjCObjectGraphDecoderImpl::decode):
+ (WebKit::InjectedBundleObjCObjectGraphDecoderImpl::decode):
+
+2012-11-28 Sam Weinig <s...@webkit.org>
+
Add an objc object graph wrapper and coder for WKConnection message bodies
https://bugs.webkit.org/show_bug.cgi?id=103589
Modified: trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm (136098 => 136099)
--- trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2012-11-29 06:23:58 UTC (rev 136098)
+++ trunk/Source/WebKit2/Shared/mac/ObjCObjectGraphCoders.mm 2012-11-29 06:24:18 UTC (rev 136099)
@@ -52,7 +52,9 @@
NSNumberType,
NSDateType,
NSDataType,
+#if defined(__LP64__) && defined(__clang__)
WKBrowsingContextControllerType,
+#endif
UnknownType,
};
@@ -72,8 +74,10 @@
return NSDateType;
if ([object isKindOfClass:[NSData class]])
return NSDataType;
+#if defined(__LP64__) && defined(__clang__)
if ([object isKindOfClass:[WKBrowsingContextController class]])
return WKBrowsingContextControllerType;
+#endif
return UnknownType;
}
@@ -270,12 +274,14 @@
return;
switch (type) {
+#if defined(__LP64__) && defined(__clang__)
case WKBrowsingContextControllerType: {
WKBrowsingContextController *browsingContextController = static_cast<WKBrowsingContextController *>(m_root);
encoder << toImpl(browsingContextController._pageRef)->pageID();
break;
}
+#endif
default:
ASSERT_NOT_REACHED();
break;
@@ -315,6 +321,7 @@
}
switch (type) {
+#if defined(__LP64__) && defined(__clang__)
case WKBrowsingContextControllerType: {
uint64_t pageID;
if (!decoder->decode(pageID))
@@ -327,6 +334,7 @@
coder.m_root = [WKBrowsingContextController _browsingContextControllerForPageRef:toAPI(webPage)];
break;
}
+#endif
default:
return false;
}
@@ -357,12 +365,15 @@
return;
switch (type) {
+#if defined(__LP64__) && defined(__clang__)
case WKBrowsingContextControllerType: {
+
WKWebProcessPlugInBrowserContextController *browserContextController = static_cast<WKWebProcessPlugInBrowserContextController *>(m_root);
encoder << toImpl(browserContextController._bundlePageRef)->pageID();
break;
}
+#endif
default:
ASSERT_NOT_REACHED();
break;
@@ -401,6 +412,7 @@
}
switch (type) {
+#if defined(__LP64__) && defined(__clang__)
case WKBrowsingContextControllerType: {
uint64_t pageID;
if (!decoder->decode(pageID))
@@ -413,6 +425,7 @@
coder.m_root = [[WKWebProcessPlugInController _shared] _browserContextControllerForBundlePageRef:toAPI(webPage)];
break;
}
+#endif
default:
return false;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
