OSDN Git Service

resolved conflicts for merge of 1457b739 to master
[android-x86/external-webkit.git] / LayoutTests /
2010-10-15 Kenny Rootresolved conflicts for merge of 1457b739 to master
2010-10-12 Cary Clarkam e0482608: am 5cff132a: change webkit text select...
2010-10-11 Teng-Hui ZhuMerge "style cleanup on GraphicsContextAndroid.cpp"
2010-10-10 Patrick Scottam ffbc540c: (-s ours) am 3f8366e5: Revert to skia...
2010-10-07 Kristian MonsenMerge WebKit at r68651 : Initial merge by git.
2010-10-04 Leon Scroggins IIIMerge "Use SelectionController to determine whether...
2010-10-04 Steve BlockMerge "Add failing test expectations for DumpRenderTree...
2010-10-01 clairehoMerge "Bug2811469 - wide space in RTL layout"
2010-10-01 Cary Clarkam 8dd042ec: (-s ours) am 8180f816: Do not merge: fix...
2010-09-29 Steve BlockAdd failing test expectations for DumpRenderTree2 for...
2010-09-29 Steve BlockReclassify failing multi-touch tests in test_expectatio...
2010-09-29 Steve BlockMerge WebKit at r67908: Initial merge by Git
2010-09-29 Iain MerrickAdd fast/encoding layout tests.
2010-09-28 Steve BlockMerge "Update the storage locations used by the Chromiu...
2010-09-27 Huahui WuMerge "Bug: 2372180"
2010-09-27 Derek SollenbergerMerge "Double Buffered Texture Support for WebKit."
2010-09-27 Steve BlockFix the Android expected result for LayoutTest http...
2010-09-22 Nicolas RoardMerge "GL utilities"
2010-09-17 Steve BlockMerge "Remove superfluous Geolocation::stop() method...
2010-09-16 Steve BlockRemove superfluous Geolocation::stop() method rogue...
2010-09-16 Iain MerrickMerge WebKit at r67178 : Cherry-pick fix for DeviceOrie...
2010-09-16 Iain MerrickMerge WebKit at r67178 : Initial merge by git.
2010-09-16 Steve BlockMerge "Remove LayoutTests/fast/dom/StyleSheet"
2010-09-15 Cary Clarkam 71d8d800: (-s ours) am 1441f89d: Do not merge -...
2010-09-15 Iain MerrickRemove LayoutTests/fast/dom/StyleSheet
2010-09-13 Steve Blockam d7ab5cca: (-s ours) am e3a33d1e: Cherry-pick securit...
2010-09-11 Kristian MonsenMerge WebKit at r66666 : Initial merge by git.
2010-09-10 Steve Blockam 574b2420: am 946ea101: Cherry-pick security fix...
2010-09-10 Steve Blockam d8a7ee4d: (-s ours) am 93f07dbc: Cherry-pick securit...
2010-09-10 Steve Blockam e21fd1b6: am badca5a6: Cherry-pick security fix...
2010-09-10 Steve Blockam 4b59a578: am 0a05678e: Cherry-pick security fix...
2010-09-10 Steve Blockam 7777773e: (-s ours) am 6dba6e09: Cherry-pick securit...
2010-09-10 Steve Blockam 229c8c38: (-s ours) am 3f2f7e2f: Cherry-pick securit...
2010-09-10 Steve Blockam 4c6e224c: am e1d3e323: Cherry-pick security fix...
2010-09-10 Steve Blockam a9b9e574: am da4ffba3: Cherry-pick security fix...
2010-09-10 Steve Blockam 359de72a: am 237faca5: Cherry-pick security fix...
2010-09-10 Steve Blockam e772cff7: (-s ours) am 440c0366: Cherry-pick securit...
2010-09-10 Steve Blockam a8a44d01: am be2b5a3f: Cherry-pick security fix...
2010-09-10 Steve Blockam 866b5c80: (-s ours) am d8dd893d: Cherry-pick securit...
2010-09-10 Steve Blockam 48c3fafe: am eea24577: Cherry-pick security fix...
2010-09-10 Steve Blockam 9836c30e: am a926fcfd: Cherry-pick security fix...
2010-09-07 Steve BlockAdds a number of fast/ LayoutTest directories to the...
2010-09-04 Steve BlockAdd fast/url LayoutTests at r66079
2010-09-02 Kristian MonsenMerge "Update to Merge WebKit at r61871: Floating-point...
2010-09-02 Steve BlockMerge changes I54430bd1,I61a04cf7,I4961f561,I36170123...
2010-09-02 Maksymilian OsowskiUpdated test_expectations.txt to use CRASH instead...
2010-09-02 Steve BlockMerge WebKit at r66079 : Initial merge by git
2010-09-02 Maksymilian OsowskiMerge "Updated the test_expectations.txt to use FAIL...
2010-09-02 Maksymilian OsowskiUpdated the test_expectations.txt to use FAIL instead...
2010-08-31 Melanie Clementsam cd011297: am ff93a851: Bug fix 2337042 <base> URL...
2010-08-27 Cary Clarkam 586c8632: (-s ours) am 90fa57cd: DO NOT MERGE make...
2010-08-27 Steve BlockMerge "Add ANGLE at r65615"
2010-08-27 Kristian MonsenMerge "Checking that all load operations are done in...
2010-08-27 Steve BlockMerge "Restore LayoutTests/storage/sql-error-codes...
2010-08-27 Steve BlockRestore LayoutTests/storage/sql-error-codes-expected.txt
2010-08-27 Steve BlockMerge "Use upstream version of ANDROID_HITTEST_WITHSIZE"
2010-08-27 Steve BlockMerge "Add missing Indexed DB tests at r65615"
2010-08-27 Steve BlockAdd missing Indexed DB tests at r65615
2010-08-26 Maksymilian OsowskiMerge "Updated the script to allow for chosing the...
2010-08-26 Steve BlockMerge "Fix line endings on a couple of Android-specific...
2010-08-26 Steve BlockFix line endings on a couple of Android-specific expect...
2010-08-25 Cary ClarkMerge "simplify cursor ring draw state"
2010-08-25 Leon ScrogginsMerge "Do not clip out found matches."
2010-08-25 Steve BlockAdd LayoutTests/http/tests/resources at r65615
2010-08-24 Cary Clarkam e7a07088: am 21ed5a45: Merge "check for null picture...
2010-08-24 Jean-Baptiste Queruam f3151d7b: am 828ef22d: merge -s ours from froyo...
2010-08-24 Cary Clarkam 0ee15178: (-s ours) am e4be1fd5: DO NOT MERGE Refact...
2010-08-24 Steve BlockMerge changes I2e7e2317,Ie6ccde3a,I3e89f231,Id06ff339...
2010-08-24 Iain MerrickMerge WebKit at r65615 : Ignore http/tests/appcache...
2010-08-24 Iain MerrickMerge WebKit at r65615 : Android-specific results for...
2010-08-24 Kristian MonsenMerge "Enable cookies for files."
2010-08-23 Steve BlockMerge "Fix location of several Android-specific LayoutT...
2010-08-23 Steve BlockFix location of several Android-specific LayoutTest...
2010-08-23 Iain MerrickMerge WebKit at r65615 : Initial merge by git.
2010-08-20 Cary ClarkMerge "order text selection by line centers"
2010-08-18 Cary ClarkMerge "Add CSS cursor ring definitions"
2010-08-18 Steve BlockMerge "Geolocation delayed permission LayoutTests now...
2010-08-18 Steve BlockGeolocation delayed permission LayoutTests now pass
2010-08-17 Henrik Baardam 3c54ece0: am 5dc34a85: activeDocumentLoader() causes...
2010-08-13 Maksymilian OsowskiMerge "Added php script in WebKitTools/DumpRenderTree...
2010-08-13 Maksymilian OsowskiAdded copyright info to test_expectations.txt
2010-08-13 Kristian MonsenMerge "Trigger a full rebuild of webcore to get the...
2010-08-13 Ben MurdochMerge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2...
2010-08-13 Ben MurdochMerge WebKit at r65072 : Update test_expectations.
2010-08-12 Ben MurdochMerge WebKit at r65072 : Initial merge by git.
2010-08-12 Kristian MonsenMerge "Send didFail to webcore for failed requests...
2010-08-11 Kristian MonsenMerge "Use libchromium_net as a static library. This...
2010-08-10 Steve BlockHook up DeviceOrientationClientMock
2010-08-09 Steve BlockMerge WebKit at r64523 : Add new LayoutTest fast/dom...
2010-08-09 Steve BlockMerge WebKit at r64523 : Initial merge by git.
2010-08-07 Steve Blockam 7c8c1ab3: am e9ee2d86: am a4279478: Cherry-pick...
2010-08-07 Steve Blockam 373399bd: am 7162fe0e: am 2b6ea029: Cherry-pick...
2010-08-05 Brian Carlstromresolved conflicts for merge of da53ac10 to master
2010-08-04 Kristian MonsenMerge "Compile fix after chromium merge"
2010-08-04 Kristian MonsenMerge "Removing the list of active loaders"
2010-08-04 Kristian MonsenMerge WebKit at r64264 : LayoutTest expected result
2010-08-04 Kristian MonsenMerge WebKit at r64264 : Initial merge by git.
2010-08-02 Maksymilian OsowskiMerge "Added test_expectations.txt file to platform...
2010-08-02 Maksymilian OsowskiAdded test_expectations.txt file to platform/android/
2010-07-27 clairehoMerge "Bug 2811402:Fixed parenthesis are not mirrored...
next