Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Normalize line endings

  • Loading branch information...
commit 6ca5c84b411aa1ea3c3edbd923e4d91516180d6f 1 parent b773e97
Timothy Clem tclem authored
Showing with 84 additions and 72 deletions.
  1. +12 −0 .gitattributes
  2. +72 −72 patches/cef_151_v8task.v6.patch
12 .gitattributes
View
@@ -0,0 +1,12 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs diff=csharp
+*.sln merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+GitHub.Tests.Integration/Fixtures/* -text
144 patches/cef_151_v8task.v6.patch
View
@@ -1,8 +1,8 @@
-Index: libcef_dll/cpptoc/v8task_cpptoc.h
-===================================================================
---- libcef_dll/cpptoc/v8task_cpptoc.h (revision 0)
-+++ libcef_dll/cpptoc/v8task_cpptoc.h (revision 0)
-@@ -0,0 +1,67 @@
+Index: libcef_dll/cpptoc/v8task_cpptoc.h
+===================================================================
+--- libcef_dll/cpptoc/v8task_cpptoc.h (revision 0)
++++ libcef_dll/cpptoc/v8task_cpptoc.h (revision 0)
+@@ -0,0 +1,67 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
@@ -70,11 +70,11 @@ Index: libcef_dll/cpptoc/v8task_cpptoc.h
+
+#endif // USING_CEF_SHARED
+#endif // _V8TASK_CPPTOC_H
-Index: libcef_dll/cpptoc/frame_cpptoc.cc
-===================================================================
---- libcef_dll/cpptoc/frame_cpptoc.cc (revision 268)
-+++ libcef_dll/cpptoc/frame_cpptoc.cc (working copy)
-@@ -15,6 +15,7 @@
+Index: libcef_dll/cpptoc/frame_cpptoc.cc
+===================================================================
+--- libcef_dll/cpptoc/frame_cpptoc.cc (revision 268)
++++ libcef_dll/cpptoc/frame_cpptoc.cc (working copy)
+@@ -15,6 +15,7 @@
#include "libcef_dll/cpptoc/request_cpptoc.h"
#include "libcef_dll/cpptoc/stream_reader_cpptoc.h"
#include "libcef_dll/ctocpp/domvisitor_ctocpp.h"
@@ -82,7 +82,7 @@ Index: libcef_dll/cpptoc/frame_cpptoc.cc
// MEMBER FUNCTIONS - Body may be edited by hand.
-@@ -175,6 +176,17 @@
+@@ -175,6 +176,17 @@
CefString(scriptUrl), startLine);
}
@@ -100,7 +100,7 @@ Index: libcef_dll/cpptoc/frame_cpptoc.cc
int CEF_CALLBACK frame_is_main(struct _cef_frame_t* self)
{
DCHECK(self);
-@@ -259,6 +271,7 @@
+@@ -259,6 +271,7 @@
struct_.struct_.load_string = frame_load_string;
struct_.struct_.load_stream = frame_load_stream;
struct_.struct_.execute_java_script = frame_execute_java_script;
@@ -108,11 +108,11 @@ Index: libcef_dll/cpptoc/frame_cpptoc.cc
struct_.struct_.is_main = frame_is_main;
struct_.struct_.is_focused = frame_is_focused;
struct_.struct_.get_name = frame_get_name;
-Index: libcef_dll/cpptoc/v8task_cpptoc.cc
-===================================================================
---- libcef_dll/cpptoc/v8task_cpptoc.cc (revision 0)
-+++ libcef_dll/cpptoc/v8task_cpptoc.cc (revision 0)
-@@ -0,0 +1,84 @@
+Index: libcef_dll/cpptoc/v8task_cpptoc.cc
+===================================================================
+--- libcef_dll/cpptoc/v8task_cpptoc.cc (revision 0)
++++ libcef_dll/cpptoc/v8task_cpptoc.cc (revision 0)
+@@ -0,0 +1,84 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
@@ -197,11 +197,11 @@ Index: libcef_dll/cpptoc/v8task_cpptoc.cc
+template<> long CefCppToC<CefV8TaskCppToC, CefV8Task,
+ cef_v8task_t>::DebugObjCt = 0;
+#endif
-Index: libcef_dll/ctocpp/v8task_ctocpp.h
-===================================================================
---- libcef_dll/ctocpp/v8task_ctocpp.h (revision 0)
-+++ libcef_dll/ctocpp/v8task_ctocpp.h (revision 0)
-@@ -0,0 +1,85 @@
+Index: libcef_dll/ctocpp/v8task_ctocpp.h
+===================================================================
+--- libcef_dll/ctocpp/v8task_ctocpp.h (revision 0)
++++ libcef_dll/ctocpp/v8task_ctocpp.h (revision 0)
+@@ -0,0 +1,85 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
@@ -287,11 +287,11 @@ Index: libcef_dll/ctocpp/v8task_ctocpp.h
+
+#endif // BUILDING_CEF_SHARED
+#endif // _V8TASK_CTOCPP_H
-Index: libcef_dll/ctocpp/frame_ctocpp.cc
-===================================================================
---- libcef_dll/ctocpp/frame_ctocpp.cc (revision 268)
-+++ libcef_dll/ctocpp/frame_ctocpp.cc (working copy)
-@@ -12,6 +12,7 @@
+Index: libcef_dll/ctocpp/frame_ctocpp.cc
+===================================================================
+--- libcef_dll/ctocpp/frame_ctocpp.cc (revision 268)
++++ libcef_dll/ctocpp/frame_ctocpp.cc (working copy)
+@@ -12,6 +12,7 @@
#include "libcef_dll/cpptoc/domvisitor_cpptoc.h"
#include "libcef_dll/ctocpp/browser_ctocpp.h"
@@ -299,7 +299,7 @@ Index: libcef_dll/ctocpp/frame_ctocpp.cc
#include "libcef_dll/ctocpp/frame_ctocpp.h"
#include "libcef_dll/ctocpp/request_ctocpp.h"
#include "libcef_dll/ctocpp/stream_reader_ctocpp.h"
-@@ -157,6 +158,14 @@
+@@ -157,6 +158,14 @@
scriptUrl.GetStruct(), startLine);
}
@@ -314,11 +314,11 @@ Index: libcef_dll/ctocpp/frame_ctocpp.cc
bool CefFrameCToCpp::IsMain()
{
if(CEF_MEMBER_MISSING(struct_, is_main))
-Index: libcef_dll/ctocpp/v8task_ctocpp.cc
-===================================================================
---- libcef_dll/ctocpp/v8task_ctocpp.cc (revision 0)
-+++ libcef_dll/ctocpp/v8task_ctocpp.cc (revision 0)
-@@ -0,0 +1,69 @@
+Index: libcef_dll/ctocpp/v8task_ctocpp.cc
+===================================================================
+--- libcef_dll/ctocpp/v8task_ctocpp.cc (revision 0)
++++ libcef_dll/ctocpp/v8task_ctocpp.cc (revision 0)
+@@ -0,0 +1,69 @@
+// Copyright (c) 2010 The Chromium Embedded Framework Authors. All rights
+// reserved. Use of this source code is governed by a BSD-style license that
+// can be found in the LICENSE file.
@@ -388,11 +388,11 @@ Index: libcef_dll/ctocpp/v8task_ctocpp.cc
+template<> long CefCToCpp<CefV8TaskCToCpp, CefV8Task,
+ cef_v8task_t>::DebugObjCt = 0;
+#endif
-Index: libcef_dll/ctocpp/frame_ctocpp.h
-===================================================================
---- libcef_dll/ctocpp/frame_ctocpp.h (revision 268)
-+++ libcef_dll/ctocpp/frame_ctocpp.h (working copy)
-@@ -50,6 +50,7 @@
+Index: libcef_dll/ctocpp/frame_ctocpp.h
+===================================================================
+--- libcef_dll/ctocpp/frame_ctocpp.h (revision 268)
++++ libcef_dll/ctocpp/frame_ctocpp.h (working copy)
+@@ -50,6 +50,7 @@
const CefString& url) OVERRIDE;
virtual void ExecuteJavaScript(const CefString& jsCode,
const CefString& scriptUrl, int startLine) OVERRIDE;
@@ -400,11 +400,11 @@ Index: libcef_dll/ctocpp/frame_ctocpp.h
virtual bool IsMain() OVERRIDE;
virtual bool IsFocused() OVERRIDE;
virtual CefString GetName() OVERRIDE;
-Index: include/cef_capi.h
-===================================================================
---- include/cef_capi.h (revision 268)
-+++ include/cef_capi.h (working copy)
-@@ -367,6 +367,44 @@
+Index: include/cef_capi.h
+===================================================================
+--- include/cef_capi.h (revision 268)
++++ include/cef_capi.h (working copy)
+@@ -367,6 +367,44 @@
} cef_task_t;
@@ -449,7 +449,7 @@ Index: include/cef_capi.h
///
// Structure to implement for visiting cookie values. The functions of this
// structure will always be called on the IO thread.
-@@ -531,6 +569,7 @@
+@@ -531,6 +569,7 @@
///
// Explicitly close the developer tools window if one exists for this browser
@@ -457,7 +457,7 @@ Index: include/cef_capi.h
// instance.
///
void (CEF_CALLBACK *close_dev_tools)(struct _cef_browser_t* self);
-@@ -752,6 +791,12 @@
+@@ -752,6 +791,12 @@
int startLine);
///
@@ -470,11 +470,11 @@ Index: include/cef_capi.h
// Returns true (1) if this is the main frame.
///
int (CEF_CALLBACK *is_main)(struct _cef_frame_t* self);
-Index: include/cef.h
-===================================================================
---- include/cef.h (revision 268)
-+++ include/cef.h (working copy)
-@@ -78,6 +78,7 @@
+Index: include/cef.h
+===================================================================
+--- include/cef.h (revision 268)
++++ include/cef.h (working copy)
+@@ -78,6 +78,7 @@
class CefV8Context;
class CefV8Handler;
class CefV8Value;
@@ -482,7 +482,7 @@ Index: include/cef.h
class CefWebURLRequest;
class CefWebURLRequestClient;
-@@ -502,7 +503,39 @@
+@@ -502,7 +503,39 @@
virtual void Execute(CefThreadId threadId) =0;
};
@@ -522,7 +522,7 @@ Index: include/cef.h
///
// Interface to implement for visiting cookie values. The methods of this class
// will always be called on the IO thread.
-@@ -907,6 +940,12 @@
+@@ -907,6 +940,12 @@
int startLine) =0;
///
@@ -535,11 +535,11 @@ Index: include/cef.h
// Returns true if this is the main frame.
///
/*--cef()--*/
-Index: libcef/browser_impl.h
-===================================================================
---- libcef/browser_impl.h (revision 268)
-+++ libcef/browser_impl.h (working copy)
-@@ -131,6 +131,8 @@
+Index: libcef/browser_impl.h
+===================================================================
+--- libcef/browser_impl.h (revision 268)
++++ libcef/browser_impl.h (working copy)
+@@ -131,6 +131,8 @@
const CefString& jsCode,
const CefString& scriptUrl,
int startLine);
@@ -548,7 +548,7 @@ Index: libcef/browser_impl.h
CefString GetURL(CefRefPtr<CefFrame> frame);
// CefFrames are light-weight objects managed by the browser and loosely
-@@ -247,6 +249,8 @@
+@@ -247,6 +249,8 @@
const CefString& js_code,
const CefString& script_url,
int start_line);
@@ -557,7 +557,7 @@ Index: libcef/browser_impl.h
void UIT_GoBackOrForward(int offset);
void UIT_Reload(bool ignoreCache);
bool UIT_Navigate(const BrowserNavigationEntry& entry,
-@@ -425,6 +429,8 @@
+@@ -425,6 +429,8 @@
virtual void LoadStream(CefRefPtr<CefStreamReader> stream,
const CefString& url) OVERRIDE
{ return browser_->LoadStream(this, stream, url); }
@@ -566,11 +566,11 @@ Index: libcef/browser_impl.h
virtual void ExecuteJavaScript(const CefString& jsCode,
const CefString& scriptUrl,
int startLine) OVERRIDE
-Index: libcef/browser_impl.cc
-===================================================================
---- libcef/browser_impl.cc (revision 268)
-+++ libcef/browser_impl.cc (working copy)
-@@ -10,6 +10,7 @@
+Index: libcef/browser_impl.cc
+===================================================================
+--- libcef/browser_impl.cc (revision 268)
++++ libcef/browser_impl.cc (working copy)
+@@ -10,6 +10,7 @@
#include "dom_document_impl.h"
#include "request_impl.h"
#include "stream_impl.h"
@@ -578,7 +578,7 @@ Index: libcef/browser_impl.cc
#include "base/file_path.h"
#include "base/path_service.h"
-@@ -576,6 +577,14 @@
+@@ -576,6 +577,14 @@
startLine));
}
@@ -593,7 +593,7 @@ Index: libcef/browser_impl.cc
CefString CefBrowserImpl::GetURL(CefRefPtr<CefFrame> frame)
{
// Verify that this method is being called on the UI thread.
-@@ -888,6 +897,33 @@
+@@ -888,6 +897,33 @@
}
}
@@ -627,11 +627,11 @@ Index: libcef/browser_impl.cc
void CefBrowserImpl::UIT_GoBackOrForward(int offset)
{
REQUIRE_UIT();
-Index: cef.gyp
-===================================================================
---- cef.gyp (revision 268)
-+++ cef.gyp (working copy)
-@@ -404,6 +404,8 @@
+Index: cef.gyp
+===================================================================
+--- cef.gyp (revision 268)
++++ cef.gyp (working copy)
+@@ -404,6 +404,8 @@
'libcef_dll/ctocpp/v8handler_ctocpp.h',
'libcef_dll/ctocpp/web_urlrequest_client_ctocpp.cc',
'libcef_dll/ctocpp/web_urlrequest_client_ctocpp.h',
@@ -640,7 +640,7 @@ Index: cef.gyp
'libcef_dll/ctocpp/write_handler_ctocpp.cc',
'libcef_dll/ctocpp/write_handler_ctocpp.h',
'libcef_dll/libcef_dll.cc',
-@@ -511,6 +513,8 @@
+@@ -511,6 +513,8 @@
'libcef_dll/cpptoc/v8handler_cpptoc.h',
'libcef_dll/cpptoc/web_urlrequest_client_cpptoc.cc',
'libcef_dll/cpptoc/web_urlrequest_client_cpptoc.h',
Please sign in to comment.
Something went wrong with that request. Please try again.