Update to Chromium revision 115322.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@435 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2011-12-21 18:35:55 +00:00
parent ec797bafe5
commit bdb588b77a
29 changed files with 119 additions and 75 deletions

View File

@ -1,8 +1,8 @@
Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp (revision 97950)
--- page/FrameView.cpp (revision 103399)
+++ page/FrameView.cpp (working copy)
@@ -152,10 +152,12 @@
@@ -176,10 +176,12 @@
m_page = page;
m_page->addScrollableArea(this);
@ -17,7 +17,7 @@ Index: page/FrameView.cpp
}
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 97950)
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
@@ -356,9 +356,13 @@