Bug 99670 – [WK2] Fix build break

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Byungwoo Lee]

Fix build break after r131679

[Byungwoo Lee]

[ 93%] [ 93%] Building CXX object Source/WebKit2/CMakeFiles/ewebkit2.dir/__/__/DerivedSources/WebKit2/WebIconDatabaseProxyMessageReceiver.cpp.o
Building CXX object Source/WebKit2/CMakeFiles/ewebkit2.dir/__/__/DerivedSources/WebKit2/WebKeyValueStorageManagerMessageReceiver.cpp.o
In file included from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h:32:0,
                 from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WebKit2/Platform/CoreIPC/Arguments.h:29,
                 from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WebKit2/Platform/CoreIPC/Connection.h:31,
                 from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h:29,
                 from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WebKit2/UIProcess/WebProcessProxy.h:31,
                 from /home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/WebKitBuild/Debug/DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp:27:
/home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WTF/wtf/PassOwnPtr.h: In constructor ‘WTF::PassOwnPtr<T>::PassOwnPtr(const WTF::PassOwnPtr<U>&) [with U = CoreIPC::ArgumentEncoder, T = CoreIPC::MessageEncoder]’:
/home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/WebKitBuild/Debug/DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp:69:68:   instantiated from here
/home/byungwoo/Workspace/git/git.webkit.org/efl/WebKit/Source/WTF/wtf/PassOwnPtr.h:54:84: error: invalid conversion from ‘WTF::PassOwnPtr<CoreIPC::ArgumentEncoder>::PtrType {aka CoreIPC::ArgumentEncoder*}’ to ‘WTF::PassOwnPtr<CoreIPC::MessageEncoder>::PtrType {aka CoreIPC::MessageEncoder*}’ [-fpermissive]

[Byungwoo Lee]

Created attachment 169323 [details]
Patch

[Ryuan Choi]

Committed r131700: <http://trac.webkit.org/changeset/131700>

[Chris Dumez]

2 webkitpy tests are failing and it *may* be related to this patch:
http://build.webkit.org/builders/EFL%20Linux%2064-bit%20Debug/builds/7346/steps/webkitpy-test/logs/stdio

[1/1597] webkit2.messages_unittest.HeaderTest.test_header failed:
  Traceback (most recent call last):
    File "/home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/Source/WebKit2/Scripts/webkit2/messages_unittest.py", line 802, in test_header
      self.assertGeneratedFileContentsEqual(file_contents, _expected_header)
    File "/home/buildslave-1/webkit-buildslave/efl-linux-64-debug/build/Source/WebKit2/Scripts/webkit2/messages_unittest.py", line 794, in assertGeneratedFileContentsEqual
      self.assertEquals(first_line, second_list[index])
  AssertionError: '    class MessageEncoder;' != '    class Connection;'