Title: [186898] trunk/Source/WebKit/win
- Revision
- 186898
- Author
- [email protected]
- Date
- 2015-07-16 10:42:05 -0700 (Thu, 16 Jul 2015)
Log Message
[Win] Gross workaround to fix build after r186858.
* WebView.cpp:
(WebView::unused5): Force export of WebCore symbol through
WebKit.dll.
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (186897 => 186898)
--- trunk/Source/WebKit/win/ChangeLog 2015-07-16 17:39:05 UTC (rev 186897)
+++ trunk/Source/WebKit/win/ChangeLog 2015-07-16 17:42:05 UTC (rev 186898)
@@ -1,3 +1,11 @@
+2015-07-16 Brent Fulgham <[email protected]>
+
+ [Win] Gross workaround to fix build after r186858.
+
+ * WebView.cpp:
+ (WebView::unused5): Force export of WebCore symbol through
+ WebKit.dll.
+
2015-07-15 Brent Fulgham <[email protected]>
[Win] Maintain consistent COM Interfaces
Modified: trunk/Source/WebKit/win/WebView.cpp (186897 => 186898)
--- trunk/Source/WebKit/win/WebView.cpp 2015-07-16 17:39:05 UTC (rev 186897)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-07-16 17:42:05 UTC (rev 186898)
@@ -130,6 +130,7 @@
#include <WebCore/PageCache.h>
#include <WebCore/PageConfiguration.h>
#include <WebCore/PageGroup.h>
+#include <WebCore/PathUtilities.h>
#include <WebCore/PlatformKeyboardEvent.h>
#include <WebCore/PlatformMouseEvent.h>
#include <WebCore/PlatformWheelEvent.h>
@@ -6680,6 +6681,11 @@
HRESULT WebView::unused5()
{
ASSERT_NOT_REACHED();
+
+ // The following line works around a linker issue in MSVC. unused5 should never be called,
+ // and this code does nothing more than force the symbol to be included in WebKit dll.
+ (void)WebCore::PathUtilities::pathWithShrinkWrappedRects(Vector<FloatRect>(), 0);
+
return E_FAIL;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
