summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "update for new audio.h header location"Dima Zavin2011-05-121-1/+1
|\
| * update for new audio.h header locationDima Zavin2011-05-121-1/+1
* | am 3ba807b9: am 169f8bc5: (-s ours) Merge "Remove unused function that relies...Jean-Baptiste Queru2011-05-120-0/+0
|\ \ | |/ |/|
| * am 169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsole...Jean-Baptiste Queru2011-05-120-0/+0
| |\
| | * Merge "Remove unused function that relies on an obsolete API"Jean-Baptiste Queru2011-05-121-7/+0
| | |\
| | | * Remove unused function that relies on an obsolete APIJean-Baptiste Queru2011-05-121-7/+0
| | |/
* | | am 5fa3323c: (-s ours) am 61719739: Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ | |/ /
| * | am 61719739: Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
| |\ \ | | |/
| | * Merge "Port toward newer versions of skia."Jean-Baptiste Queru2011-05-121-0/+4
| | |\
| | | * Port toward newer versions of skia.Jean-Baptiste Queru2011-05-121-0/+4
| | |/
* | | am 7c3ea1eb: am d45deba0: (-s ours) Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ | |/ /
| * | am d45deba0: (-s ours) Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-120-0/+0
| |\ \ | | |/
| | * Merge "Switch to SkSafeRef"Jean-Baptiste Queru2011-05-128-20/+20
| | |\
| | | * Switch to SkSafeRefJean-Baptiste Queru2011-05-128-20/+20
| | |/
* | | am c9818b52: am 555569c5: (-s ours) Merge "Switch to SkSafeUnref for better p...Jean-Baptiste Queru2011-05-120-0/+0
|\ \ \ | |/ /
| * | am 555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-120-0/+0
| |\ \ | | |/
| | * Merge "Switch to SkSafeUnref for better portability"Jean-Baptiste Queru2011-05-1218-37/+37
| | |\
| | | * Switch to SkSafeUnref for better portabilityJean-Baptiste Queru2011-05-1118-37/+37
| | |/
* | | Clean up JavaBridgeSteve Block2011-05-121-11/+12
* | | Clean up DeviceMotionClientImpl and DeviceOrientationClientImplSteve Block2011-05-122-6/+4
* | | Clean up WebViewCoreSteve Block2011-05-122-44/+35
* | | Add null pointer check when searching for a plugin widget.Derek Sollenberger2011-05-111-1/+1
* | | am 5581ea83: am 86ca6e2e: am c74d30ac: Merge "Fix calculation in WebView::scr...Russell Brenner2011-05-101-8/+0
|\ \ \ | |/ /
| * | am 86ca6e2e: am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScre...Russell Brenner2011-05-101-8/+0
| |\ \
| | * \ am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into hone...Russell Brenner2011-05-101-8/+0
| | |\ \
| | | * \ Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2Russell Brenner2011-05-101-8/+0
| | | |\ \
| | | | * | Fix calculation in WebView::scrollRectOnScreenRussell Brenner2011-05-051-8/+0
* | | | | | am 53cd6a87: (-s ours) am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-100-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am aecd2790: am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| |\ \ \ \ \ | | |/ / / /
| | * | | | am c3da3ea3: DO NOT MERGENicolas Roard2011-05-094-20/+60
| | |\ \ \ \ | | | |/ / /
| | | * | | DO NOT MERGENicolas Roard2011-05-094-20/+60
* | | | | | Clean up makefiles in preparation for new Source/ directorySteve Block2011-05-104-102/+103
* | | | | | Clean up includes in WebStorage.cppSteve Block2011-05-101-4/+4
* | | | | | Merge WebKit at r74534: Update ThirdPartyProject.propBen Murdoch2011-05-101-5/+2
* | | | | | Merge WebKit at r74534: Fix build. (XSLTProcessoeLibxslt.cpp)Ben Murdoch2011-05-101-0/+1
* | | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (setPlatformCompositeO...Ben Murdoch2011-05-101-1/+1
* | | | | | Merge WebKit at r74534: Rename rendering methodsBen Murdoch2011-05-102-2/+2
* | | | | | Merge WebKit at r74534: Fix WebSettings.cppBen Murdoch2011-05-101-1/+1
* | | | | | Merge WebKit at r74534: Fix WebCoreFrameBridge.cppBen Murdoch2011-05-101-1/+1
* | | | | | Merge WebKit at r74534: Fix EditorClientAndroid.cpp (SpellChecker)Ben Murdoch2011-05-102-0/+3
* | | | | | Merge WebKit at r74534: Fix EditorClientAndroid.cpp (getGuessesForWord)Ben Murdoch2011-05-102-2/+2
* | | | | | Merge WebKit at r74534: Fix WebCoreFrameBridge.cpp andBen Murdoch2011-05-102-13/+25
* | | | | | Merge WebKit at r74534: Fix RenderBlockLineLayout.cpp and others.Ben Murdoch2011-05-103-4/+4
* | | | | | Merge WebKit at r74534: Fix ImageSourceAndroid.cppBen Murdoch2011-05-101-4/+4
* | | | | | Merge WebKit at r74534: Fix ImageBufferAndroid.cppBen Murdoch2011-05-101-1/+1
* | | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cpp (Paths)Ben Murdoch2011-05-101-3/+16
* | | | | | Merge WebKit at r74534: Fix GraphicsContextAndroid.cppBen Murdoch2011-05-101-12/+9
* | | | | | Merge WebKit at r74534: Fix FontDataAndroid.cppBen Murdoch2011-05-102-7/+25
* | | | | | Merge WebKit at r74534: Fix FontAndroid.cpp (TextMode constants)Ben Murdoch2011-05-101-8/+8
* | | | | | Merge WebKit at r74534: Fix FontAndroid.cpp (getShadow)Ben Murdoch2011-05-101-1/+2