bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 129376. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@580 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-04-04 22:38:30 +00:00
parent 0930631a5f
commit c8848da3bb
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cef1/patch/patches/spi_webcore_364.patch
View File

@ -1,20 +1,20 @@
Index: page/FrameView.cpp Index: page/FrameView.cpp
=================================================================== ===================================================================
--- page/FrameView.cpp (revision 106313) --- page/FrameView.cpp (revision 112327)
+++ page/FrameView.cpp (working copy) +++ page/FrameView.cpp (working copy)
@@ -157,10 +157,12 @@ @@ -159,10 +159,12 @@
m_page = page; if (!page)
m_page->addScrollableArea(this); return;
+#if 0 +#if 0
if (m_frame == m_page->mainFrame()) { if (m_frame == page->mainFrame()) {
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed); ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed); ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
}
+#endif
}
} }
+#endif
} }
PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
=================================================================== ===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144) --- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)