mirror of
				https://bitbucket.org/chromiumembedded/cef
				synced 2025-06-05 21:39:12 +02:00 
			
		
		
		
	Update to Chromium revision 190564.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1168 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
		@@ -16,11 +16,6 @@ patches = [
 | 
			
		||||
    'name': 'build',
 | 
			
		||||
    'path': '../build/',
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    # http://code.google.com/p/gyp/issues/detail?id=223
 | 
			
		||||
    'name': 'tools_gyp',
 | 
			
		||||
    'path': '../tools/gyp/',
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    # http://code.google.com/p/chromiumembedded/issues/detail?id=496
 | 
			
		||||
    'name': 'zlib',
 | 
			
		||||
@@ -42,6 +37,11 @@ patches = [
 | 
			
		||||
    'name': 'webkit_features',
 | 
			
		||||
    'path': '../third_party/WebKit/Source/WebKit/chromium/',
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    # http://code.google.com/p/chromiumembedded/issues/detail?id=933
 | 
			
		||||
    'name': 'webkit_933',
 | 
			
		||||
    'path': '../third_party/WebKit/Source/WebKit/chromium/src/',
 | 
			
		||||
  },
 | 
			
		||||
  {
 | 
			
		||||
    # http://code.google.com/p/chromiumembedded/issues/detail?id=364
 | 
			
		||||
    'name': 'spi_webcore_364',
 | 
			
		||||
 
 | 
			
		||||
@@ -1,8 +1,8 @@
 | 
			
		||||
Index: page/FrameView.cpp
 | 
			
		||||
===================================================================
 | 
			
		||||
--- page/FrameView.cpp	(revision 143980)
 | 
			
		||||
--- page/FrameView.cpp	(revision 146842)
 | 
			
		||||
+++ page/FrameView.cpp	(working copy)
 | 
			
		||||
@@ -208,10 +208,12 @@
 | 
			
		||||
@@ -209,10 +209,12 @@
 | 
			
		||||
     if (!page)
 | 
			
		||||
         return;
 | 
			
		||||
 
 | 
			
		||||
@@ -17,7 +17,7 @@ Index: page/FrameView.cpp
 | 
			
		||||
 PassRefPtr<FrameView> FrameView::create(Frame* frame)
 | 
			
		||||
Index: platform/mac/NSScrollerImpDetails.mm
 | 
			
		||||
===================================================================
 | 
			
		||||
--- platform/mac/NSScrollerImpDetails.mm	(revision 143980)
 | 
			
		||||
--- platform/mac/NSScrollerImpDetails.mm	(revision 146842)
 | 
			
		||||
+++ platform/mac/NSScrollerImpDetails.mm	(working copy)
 | 
			
		||||
@@ -34,6 +34,7 @@
 | 
			
		||||
 #if PLATFORM(CHROMIUM)
 | 
			
		||||
 
 | 
			
		||||
@@ -1,14 +0,0 @@
 | 
			
		||||
Index: pylib/gyp/input.py
 | 
			
		||||
===================================================================
 | 
			
		||||
--- pylib/gyp/input.py	(revision 1583)
 | 
			
		||||
+++ pylib/gyp/input.py	(working copy)
 | 
			
		||||
@@ -843,7 +843,8 @@
 | 
			
		||||
           # that don't load quickly, this can be faster than
 | 
			
		||||
           # <!(python modulename param eters). Do this in |build_file_dir|.
 | 
			
		||||
           oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
 | 
			
		||||
-          os.chdir(build_file_dir)
 | 
			
		||||
+          if not build_file_dir is None:
 | 
			
		||||
+            os.chdir(build_file_dir)
 | 
			
		||||
           try:
 | 
			
		||||
 
 | 
			
		||||
             parsed_contents = shlex.split(contents)
 | 
			
		||||
							
								
								
									
										13
									
								
								patch/patches/webkit_933.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								patch/patches/webkit_933.patch
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,13 @@
 | 
			
		||||
Index: WebNode.cpp
 | 
			
		||||
===================================================================
 | 
			
		||||
--- WebNode.cpp	(revision 146842)
 | 
			
		||||
+++ WebNode.cpp	(working copy)
 | 
			
		||||
@@ -181,7 +181,7 @@
 | 
			
		||||
 void WebNode::addEventListener(const WebString& eventType, WebDOMEventListener* listener, bool useCapture)
 | 
			
		||||
 {
 | 
			
		||||
     // Please do not add more eventTypes to this list without an API review.
 | 
			
		||||
-    RELEASE_ASSERT(eventType == "mousedown");
 | 
			
		||||
+    //RELEASE_ASSERT(eventType == "mousedown");
 | 
			
		||||
 
 | 
			
		||||
     EventListenerWrapper* listenerWrapper = listener->createEventListenerWrapper(eventType, useCapture, m_private.get());
 | 
			
		||||
     // The listenerWrapper is only referenced by the actual Node.  Once it goes
 | 
			
		||||
		Reference in New Issue
	
	Block a user