bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Restore original file permissions after patching a file (issue #387).

Browse Source 
- Add the ability to selectively apply patches based on the presence of an environment variable (issue #388).
- Add a patch to disable scrollbar bounce and scrollbar overlay on Lion based on the presence of the CEF_SPI_BUILD environment variable (issue #364).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@339 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-10-25 16:36:38 +00:00
parent 7a91ff899f
commit df921942ea
4 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
patch/patch.cfg
View File

@@ -1,12 +1,30 @@
# An element of this array associates a patch file with a target directory.
# All paths in the patch file must be relative to that directory. Each patch
# file entry for source code changes should be proceeded by the code review
# or bug report link that it relates to.
patches = {
# http://codereview.chromium.org/8086022/
'build' : '../build/',
# http://codereview.chromium.org/6730028/
'base' : '../base/',
# http://code.google.com/p/gyp/issues/detail?id=223
'tools_gyp' : '../tools/gyp/',
}
# Each map in the list associates a patch file name with a target path and
# optional condition. All paths in the patch file must be relative to the
# target path. Each map should include a comment linking to the code review
# or bug report that the patch relates to. If a condition is provided the
# patch will only be applied if an environment variable with the specified
# name exists.
patches = [
{
# http://codereview.chromium.org/8086022/
'name': 'build',
'path': '../build/',
},
{
# http://codereview.chromium.org/6730028/
'name': 'base',
'path': '../base/',
},
{
# 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=364
'name': 'spi_webcore_364',
'path': '../third_party/WebKit/Source/WebCore/',
'condition': 'CEF_SPI_BUILD',
},
]

35
patch/patches/spi_webcore_364.patch Normal file
View File

@@ -0,0 +1,35 @@
Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp (revision 97950)
+++ page/FrameView.cpp (working copy)
@@ -152,10 +152,12 @@
m_page = page;
m_page->addScrollableArea(this);
+#if 0
if (m_frame == m_page->mainFrame()) {
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
}
+#endif
}
}
}
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 97950)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
@@ -356,9 +356,13 @@
bool isScrollbarOverlayAPIAvailable()
{
+#if 0
static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
[lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
return apiAvailable;
+#else
+ return false;
+#endif
}
#endif // USE(WK_SCROLLBAR_PAINTER)