Fix CMake build.
Source/WebCore:
* PlatformMac.cmake:
Add PerformanceLoggingCocoa.mm after r209181.
Source/WebKit2:
* CMakeLists.txt:
Add the new NetworkProcess/capture include directory to find new headers from r209498.
* NetworkProcess/capture/NetworkCaptureEvent.cpp:
(WebKit::NetworkCapture::Response::Response):
(WebKit::NetworkCapture::Error::Error):
The String constructor was ambiguous after r209498 because URL has an operator NSString* and String has an NSString constructor.
We should get rid of operator NSString* and operator String on URL.
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
Add some ENABLE(MEDIA_STREAM) macros to fix the build without it enabled after r209512.
Tools:
* DumpRenderTree/PlatformMac.cmake:
Remove CheckedMalloc.cpp after r209516.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@209533 268f45cc-cd09-0410-ab3c-d52691b4dbfc
9 files changed
