Public Pastes
SHARE
TWEET

patch

akshay1994 Mar 18th, 2014 179 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/Source/JavaScriptCore/runtime/JSLock.cpp b/Source/JavaScriptCore/runtime/JSLock.cpp
  2. index 2d3a1ad..9309ddc 100644
  3. --- a/Source/JavaScriptCore/runtime/JSLock.cpp
  4. +++ b/Source/JavaScriptCore/runtime/JSLock.cpp
  5. @@ -98,7 +98,7 @@ void JSLock::willDestroyVM(VM* vm)
  6.  
  7.  void JSLock::setExclusiveThread(std::thread::id threadId)
  8.  {
  9. -    RELEASE_ASSERT(!m_lockCount && m_ownerThreadID == std::thread::id());
  10. +//    RELEASE_ASSERT(!m_lockCount && m_ownerThreadID == std::thread::id());
  11.      m_hasExclusiveThread = (threadId != std::thread::id());
  12.      m_ownerThreadID = threadId;
  13.  }
  14. diff --git a/Source/WebCore/PlatformHaiku.cmake b/Source/WebCore/PlatformHaiku.cmake
  15. index 3d4514f..614b583 100644
  16. --- a/Source/WebCore/PlatformHaiku.cmake
  17. +++ b/Source/WebCore/PlatformHaiku.cmake
  18. @@ -81,7 +81,7 @@ LIST(APPEND WebCore_SOURCES
  19.    platform/network/haiku/ResourceRequestHaiku.cpp
  20.    platform/network/haiku/CookieJarHaiku.cpp
  21.  
  22. -  platform/network/curl/SocketStreamHandleCurl.cpp # not implemented
  23. +  platform/network/haiku/SocketStreamHandleHaiku.cpp # not implemented
  24.    platform/network/NetworkStorageSessionStub.cpp
  25.    
  26.    platform/posix/FileSystemPOSIX.cpp
  27. diff --git a/Source/WebCore/platform/network/haiku/SocketStreamHandle.h b/Source/WebCore/platform/network/haiku/SocketStreamHandle.h
  28. index a82319f..2bdea13 100644
  29. --- a/Source/WebCore/platform/network/haiku/SocketStreamHandle.h
  30. +++ b/Source/WebCore/platform/network/haiku/SocketStreamHandle.h
  31. @@ -33,7 +33,7 @@
  32.  #define SocketStreamHandle_h
  33.  
  34.  #include "SocketStreamHandleBase.h"
  35. -
  36. +#include <Socket.h>
  37.  #include <wtf/PassRefPtr.h>
  38.  #include <wtf/RefCounted.h>
  39.  
  40. @@ -48,19 +48,23 @@ namespace WebCore {
  41.          static PassRefPtr<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client) { return adoptRef(new SocketStreamHandle(url, client)); }
  42.  
  43.          virtual ~SocketStreamHandle();
  44. -
  45. +        int async_read_push(const char * data, int length);
  46. +        int async_sendPendingData();
  47. +        BSocket * sock;
  48.      protected:
  49.          virtual int platformSend(const char* data, int length);
  50.          virtual void platformClose();
  51.  
  52.      private:
  53.          SocketStreamHandle(const URL&, SocketStreamHandleClient*);
  54. -
  55. +               BNetworkAddress *peer;
  56. +               int rd_thread, wr_thread;
  57.          // No authentication for streams per se, but proxy may ask for credentials.
  58.          void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
  59.          void receivedCredential(const AuthenticationChallenge&, const Credential&);
  60.          void receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&);
  61.          void receivedCancellation(const AuthenticationChallenge&);
  62. +
  63.      };
  64.  
  65.  }  // namespace WebCore
  66. diff --git a/Source/cmake/FindICU.cmake b/Source/cmake/FindICU.cmake
  67. index a3fe795..6ef8fc7 100644
  68. --- a/Source/cmake/FindICU.cmake
  69. +++ b/Source/cmake/FindICU.cmake
  70. @@ -22,7 +22,7 @@ find_library(
  71.      NAMES icuuc cygicuuc cygicuuc32
  72.      DOC "Libraries to link against for the common parts of ICU")
  73.  mark_as_advanced(ICU_LIBRARY)
  74. -
  75. +message("Helo1 ${PATH}")
  76.  # Copy the results to the output variables.
  77.  if (ICU_INCLUDE_DIR AND ICU_LIBRARY)
  78.      set(ICU_FOUND 1)
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!
 
Top