Title: [210465] trunk/Source/WebCore
- Revision
- 210465
- Author
- [email protected]
- Date
- 2017-01-06 18:41:24 -0800 (Fri, 06 Jan 2017)
Log Message
Fix WinCairo build after r210319.
https://bugs.webkit.org/show_bug.cgi?id=166635
* DerivedSources.cpp:
A toJS call was ambiguous, but only if the generated IndexedDB bindings are compiled all-in-one in DerivedSources.cpp.
Compiling these few files separately (which happens automatically in the CMake build) fixes the build and won't increase
the total object files beyond MSVC's current 2GB limit.
* bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
(WebCore::JSWebGLRenderingContextBaseOwner::isReachableFromOpaqueRoots):
Unknown was an ambiguous symbol. It's also defined in winioctl.h.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210464 => 210465)
--- trunk/Source/WebCore/ChangeLog 2017-01-07 02:13:07 UTC (rev 210464)
+++ trunk/Source/WebCore/ChangeLog 2017-01-07 02:41:24 UTC (rev 210465)
@@ -1,3 +1,16 @@
+2017-01-06 Alex Christensen <[email protected]>
+
+ Fix WinCairo build after r210319.
+ https://bugs.webkit.org/show_bug.cgi?id=166635
+
+ * DerivedSources.cpp:
+ A toJS call was ambiguous, but only if the generated IndexedDB bindings are compiled all-in-one in DerivedSources.cpp.
+ Compiling these few files separately (which happens automatically in the CMake build) fixes the build and won't increase
+ the total object files beyond MSVC's current 2GB limit.
+ * bindings/js/JSWebGLRenderingContextBaseCustom.cpp:
+ (WebCore::JSWebGLRenderingContextBaseOwner::isReachableFromOpaqueRoots):
+ Unknown was an ambiguous symbol. It's also defined in winioctl.h.
+
2017-01-06 Zalan Bujtas <[email protected]>
Text highlight causes Yoon Gothic webfont to reflow.
Modified: trunk/Source/WebCore/DerivedSources.cpp (210464 => 210465)
--- trunk/Source/WebCore/DerivedSources.cpp 2017-01-07 02:13:07 UTC (rev 210464)
+++ trunk/Source/WebCore/DerivedSources.cpp 2017-01-07 02:41:24 UTC (rev 210465)
@@ -299,20 +299,6 @@
#include "JSHTMLUnknownElement.cpp"
#include "JSHTMLUListElement.cpp"
#include "JSHTMLVideoElement.cpp"
-#if ENABLE(INDEXED_DATABASE)
-#include "JSIDBCursor.cpp"
-#include "JSIDBCursorWithValue.cpp"
-#include "JSIDBDatabase.cpp"
-#include "JSIDBFactory.cpp"
-#include "JSIDBIndex.cpp"
-#include "JSIDBKeyRange.cpp"
-#include "JSIDBObjectStore.cpp"
-#include "JSIDBOpenDBRequest.cpp"
-#include "JSIDBRequest.cpp"
-#include "JSIDBTransaction.cpp"
-#include "JSIDBTransactionMode.cpp"
-#include "JSIDBVersionChangeEvent.cpp"
-#endif
#include "JSImageData.cpp"
#include "JSInputEvent.cpp"
#include "JSInspectorFrontendHost.cpp"
Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp (210464 => 210465)
--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2017-01-07 02:13:07 UTC (rev 210464)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextBaseCustom.cpp 2017-01-07 02:41:24 UTC (rev 210465)
@@ -190,7 +190,7 @@
return jsNull();
}
-bool JSWebGLRenderingContextBaseOwner::isReachableFromOpaqueRoots(Handle<Unknown> handle, void*, SlotVisitor& visitor)
+bool JSWebGLRenderingContextBaseOwner::isReachableFromOpaqueRoots(Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
{
JSWebGLRenderingContextBase* jsWebGLRenderingContext = jsCast<JSWebGLRenderingContextBase*>(handle.slot()->asCell());
void* root = WebCore::root(jsWebGLRenderingContext->wrapped().canvas());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
