Title: [113105] trunk/Source
- Revision
- 113105
- Author
- [email protected]
- Date
- 2012-04-03 16:26:28 -0700 (Tue, 03 Apr 2012)
Log Message
Unreviewed. This patch adds an ugly, ugly hack to bandaid over the
Windows component build. See comments in the code for details.
Source/Platform:
* chromium/public/WebMediaStreamSourcesRequest.h:
(WebMediaStreamSourcesRequest):
Source/WebCore:
* platform/chromium/support/WebMediaStreamSourcesRequest.cpp:
(WebKit::WebMediaStreamSourcesRequest::dummy):
(WebKit):
Source/WebKit/chromium:
* src/WebKit.cpp:
(WebKit::shutdown):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (113104 => 113105)
--- trunk/Source/Platform/ChangeLog 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/Platform/ChangeLog 2012-04-03 23:26:28 UTC (rev 113105)
@@ -1,3 +1,11 @@
+2012-04-03 Adam Barth <[email protected]>
+
+ Unreviewed. This patch adds an ugly, ugly hack to bandaid over the
+ Windows component build. See comments in the code for details.
+
+ * chromium/public/WebMediaStreamSourcesRequest.h:
+ (WebMediaStreamSourcesRequest):
+
2012-04-02 Zhenyao Mo <[email protected]>
Implement WebGLShaderPrecisionFormat
Modified: trunk/Source/Platform/chromium/public/WebMediaStreamSourcesRequest.h (113104 => 113105)
--- trunk/Source/Platform/chromium/public/WebMediaStreamSourcesRequest.h 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/Platform/chromium/public/WebMediaStreamSourcesRequest.h 2012-04-03 23:26:28 UTC (rev 113105)
@@ -55,6 +55,13 @@
WEBKIT_EXPORT void didCompleteQuery(const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources) const;
+ // This function is a temporary hack to make the Windows component build
+ // compile. Without this function, WebMediaStreamSourcesRequest.obj won't
+ // be pulled into webkit.dll and content.dll will fail to link. This
+ // function is not the correct solution to this problem but will let us
+ // fix the build while we work on a correct solution.
+ WEBKIT_EXPORT static void dummy();
+
#if WEBKIT_IMPLEMENTATION
WebMediaStreamSourcesRequest(const WTF::PassRefPtr<WebCore::MediaStreamSourcesQueryClient>&);
#endif
Modified: trunk/Source/WebCore/ChangeLog (113104 => 113105)
--- trunk/Source/WebCore/ChangeLog 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/WebCore/ChangeLog 2012-04-03 23:26:28 UTC (rev 113105)
@@ -1,3 +1,12 @@
+2012-04-03 Adam Barth <[email protected]>
+
+ Unreviewed. This patch adds an ugly, ugly hack to bandaid over the
+ Windows component build. See comments in the code for details.
+
+ * platform/chromium/support/WebMediaStreamSourcesRequest.cpp:
+ (WebKit::WebMediaStreamSourcesRequest::dummy):
+ (WebKit):
+
2012-04-03 Abhishek Arya <[email protected]>
Crash in SelectorChecker::checkOneSelector.
Modified: trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSourcesRequest.cpp (113104 => 113105)
--- trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSourcesRequest.cpp 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSourcesRequest.cpp 2012-04-03 23:26:28 UTC (rev 113105)
@@ -82,6 +82,10 @@
m_private->didCompleteQuery(audio, video);
}
+void WebMediaStreamSourcesRequest::dummy()
+{
+}
+
} // namespace WebKit
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebKit/chromium/ChangeLog (113104 => 113105)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-04-03 23:26:28 UTC (rev 113105)
@@ -1,3 +1,11 @@
+2012-04-03 Adam Barth <[email protected]>
+
+ Unreviewed. This patch adds an ugly, ugly hack to bandaid over the
+ Windows component build. See comments in the code for details.
+
+ * src/WebKit.cpp:
+ (WebKit::shutdown):
+
2012-04-03 Dimitri Glazkov <[email protected]>
Unreviewed, rolling out r113087.
Modified: trunk/Source/WebKit/chromium/src/WebKit.cpp (113104 => 113105)
--- trunk/Source/WebKit/chromium/src/WebKit.cpp 2012-04-03 23:25:10 UTC (rev 113104)
+++ trunk/Source/WebKit/chromium/src/WebKit.cpp 2012-04-03 23:26:28 UTC (rev 113105)
@@ -45,6 +45,7 @@
#include "platform/WebThread.h"
#include "v8.h"
#include <public/Platform.h>
+#include <public/WebMediaStreamSourcesRequest.h>
#include <wtf/Assertions.h>
#include <wtf/MainThread.h>
#include <wtf/Threading.h>
@@ -147,6 +148,14 @@
#endif
s_webKitPlatformSupport = 0;
Platform::shutdown();
+
+ // This function call exists to make sure WebMediaStreamSourcesRequest.obj
+ // gets pulled into the Windows component build. (See comment in
+ // WebMediaStreamSourcesRequest.h.)
+ //
+ // FIXME: Remove this call once we figure out the right way to fix these
+ // link errors.
+ WebMediaStreamSourcesRequest::dummy();
}
WebKitPlatformSupport* webKitPlatformSupport()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
