summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-05-01Record Chromium merge at DEPS revision 267519idea133-weekly-releaseBo Liu
This commit was generated by merge_to_master.py. Change-Id: I8c4052de12212a03a4da752c4a15a4c98dab5619
2014-05-01Merge from Chromium at DEPS revision 267519Bo Liu
This commit was generated by merge_to_master.py. Change-Id: Ib62834e2366da2e1ae92212e9a7c442ba679dccc
2014-04-24Record Chromium merge at DEPS revision 265802Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I13125338336420a973e9f5ff97efaa6edcaea971
2014-04-24Merge from Chromium at DEPS revision 265802Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Id3019f665864eae3347816bf95068746797aac28
2014-04-16Record Chromium merge at DEPS revision 263965Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I59b2813400bc393175b592d19a506af9a573e77d
2014-04-16Merge from Chromium at DEPS revision 263965Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I857eeb578343d96fdbf8114883e486487777218a
2014-04-10Record Chromium merge at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I6cd00a906aaaffbd1a5a2a515539a7bda630a102
2014-04-10Merge from Chromium at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I767658f35150c8e0099156a5a5daf4bdf7e8ae0f
2014-04-03Record Chromium merge at DEPS revision 261286Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I63554fc13bcb2ec47aee82d8f3ad21603c77aa65
2014-04-03Merge from Chromium at DEPS revision 261286Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I756d37445fd7f470b1689ad81318e715d4244987
2014-04-01Record Chromium merge at DEPS revision 260540Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I8bd01beb65a2cf466de4d64ddf14d1167e9dd5ca
2014-04-01Merge from Chromium at DEPS revision 260540Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I59405d8a82d381c51259a8c53360f0c4e1b89f50
2014-03-31Record Chromium merge at DEPS revision 260458Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I87b331a86bb3df5a56406cdae37accbb464dbf1a
2014-03-31Merge from Chromium at DEPS revision 260458Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I01166d4072567f174b02707d7a0850cb3fe1fd8a
2014-03-28am a55aa4b6: (-s ours) am 6d81f81e: Merge "Update makefiles following gyp ↵Torne (Richard Coles)
r1857 cherrypick." * commit 'a55aa4b6a77e9a79f088da508d82f617c0378707': Update makefiles following gyp r1857 cherrypick.
2014-03-28am daa4ebbc: (-s ours) am d11160e7: Merge "Explicitly pass encoding to ↵Ying Wang
io.open()" * commit 'daa4ebbc8af264094cb3caf7aa82173a1f4f3a29': Explicitly pass encoding to io.open()
2014-03-21Record Chromium merge at DEPS revision 258528Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id766ab26b662ef2170ea4ca725c50d3ef3f2e37f
2014-03-21Merge from Chromium at DEPS revision 258528Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I28602a0bfd7a629ec7a60a73debd10637ad32fd4
2014-03-18Record Chromium merge at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id01b911ec9f21ee67de57d2af1c18d7272f3374f
2014-03-18Merge from Chromium at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043
2014-02-25am 6d81f81e: Merge "Update makefiles following gyp r1857 cherrypick."Torne (Richard Coles)
* commit '6d81f81eb41d7cc6e64344522ea8f8037894378c': Update makefiles following gyp r1857 cherrypick.
2014-02-25Merge "Update makefiles following gyp r1857 cherrypick."chromium_org-pre-replicationTorne (Richard Coles)
2014-02-25Update makefiles following gyp r1857 cherrypick.Torne (Richard Coles)
gyp r1857 was cherrypicked to fix an issue with assembly source files on 64-bit hosts; regenerate the makefiles. Change-Id: I313e45ae1decb97204db840628ceced4b17d338f
2014-02-21Record Chromium merge at DEPS revision 251904Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I0c6829334921d80adb1c954290f83ac41fc4280d
2014-02-21Merge from Chromium at DEPS revision 251904Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I8ca36eee41eba7e9a56d6728a9d19e5883d7058c
2014-01-31am d11160e7: Merge "Explicitly pass encoding to io.open()"Ying Wang
* commit 'd11160e73308ac62a22db691ffbac4a3408e30aa': Explicitly pass encoding to io.open()
2013-12-19Merge "Explicitly pass encoding to io.open()"Ying Wang
2013-12-19Explicitly pass encoding to io.open()Ying Wang
This fixed build error on Mac OS X. Change-Id: I1dc5c63bc1f1e0e08a5caf44064d661e95040244
2013-12-18Record Chromium merge at DEPS revision 240154Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ide444cecbdced6c9cb5dc82dcdd1d0211f7ebf46
2013-12-18Merge from Chromium at DEPS revision 240154Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Idca0efe87ed6b721349fbeab55bfdc919cc4941d
2013-12-06am 33137ed5: am f6f523a0: Merge commit ↵The Android Open Source Project
\'1aaaebb25db3ae24e6a55f89a1b9e19a8d6c0b99\' into HEAD * commit '33137ed583f451de469c5975c73751c1eb249f09':
2013-12-06am b261642e: reset to klp-ub-dev at sha1 1aaaebb with historyQiwen Zhao
* commit 'b261642e4b2b8d4efd52fc1b775139562ad3de53': Initial empty repository Fix frequent resetting to initialScale in non-useWideViewport mode.
2013-12-05am f6f523a0: Merge commit \'1aaaebb25db3ae24e6a55f89a1b9e19a8d6c0b99\' into HEADThe Android Open Source Project
* commit 'f6f523a064b733bcb9f51678d67eb07650b51213':
2013-12-05am 1aaaebb2: (-s ours) Merge "Fix badcast in event::isGestureEvent" into klp-devKristian Monsen
* commit '1aaaebb25db3ae24e6a55f89a1b9e19a8d6c0b99': Fix badcast in event::isGestureEvent
2013-12-05am 47239463: (-s ours) Merge "Use Event::isTouchEvent() to prevent a bad ↵Kristian Monsen
cast" into klp-dev * commit '4723946312b1d8771464a111d7e766d0affe60d4': Use Event::isTouchEvent() to prevent a bad cast
2013-12-05am f8200fac: (-s ours) Merge "Heap-use-after-free in ↵Selim Gurun
WebCore::RenderObject::childAt" into klp-dev * commit 'f8200fac757890b9ffa1d0bfd8dfbd5309d36ee6': Heap-use-after-free in WebCore::RenderObject::childAt
2013-12-05am fef9fd28: (-s ours) Merge "Fix Range.insertNode" into klp-devSelim Gurun
* commit 'fef9fd2859e359c6f1ed6da3f8a26cf782d0248e': Fix Range.insertNode
2013-12-05am 757b9b22: (-s ours) Merge "SVGPropertyTearOffs should detachChildren ↵Selim Gurun
before deleting its value" into klp-dev * commit '757b9b222466abfebe49ea2ece77eeac55708ce9': SVGPropertyTearOffs should detachChildren before deleting its value
2013-12-05am fe6262e1: (-s ours) patch from paul.lind@imgtec.com fix allocator alignmentJonathan Dixon
* commit 'fe6262e1acba725d438cd0f8464e7faaeb886b0a': patch from paul.lind@imgtec.com fix allocator alignment
2013-12-05am 070b047c: (-s ours) Merge "Cherry-pick: Scale the layout width by the UA ↵Mikhail Naganov
initial scale" into klp-dev * commit '070b047c9a75d418df397df222b35beacf212a9c': Cherry-pick: Scale the layout width by the UA initial scale
2013-12-05am 4452796f: (-s ours) Merge "Cherry-pick: Add a legacy quirk for ↵Mikhail Naganov
\'user-scalable=no\' case" into klp-dev * commit '4452796f2583769a469527401eed5e43608b8493': Cherry-pick: Add a legacy quirk for 'user-scalable=no' case
2013-12-05am addfedf6: (-s ours) Restrict conditions when the page\'s viewport meta ↵Mikhail Naganov
overrides setInitialScale * commit 'addfedf6109427ded65e9878905565d24939503f': Restrict conditions when the page's viewport meta overrides setInitialScale
2013-12-05am a8fbe371: (-s ours) Merge "Fix frequent resetting to initialScale in ↵Alexandre Elias
non-useWideViewport mode." into klp-dev * commit 'a8fbe37117bd3b45dc6c01424d8e6c8155a55444': Fix frequent resetting to initialScale in non-useWideViewport mode.
2013-12-05am d40472fe: (-s ours) merge in klp-release (no-op)Ed Heyl
* commit 'd40472feb5ebf466abcf876c8cea03bc417e425f': Cherry-pick: [Android WebView] Add a compatibility quirk for returning screen sizes in physical pixels
2013-12-05am 415f9e82: (-s ours) Patch in "Fix webfont loading fallback height issue ↵Jonathan Dixon
(for m30)" * commit '415f9e825b3adf96404879fdf5b1548504b195d1': Patch in "Fix webfont loading fallback height issue (for m30)"
2013-12-05am 8dc37564: (-s ours) Merge "Cherry-pick http://crrev.com/27262002 "Should ↵Alexandre Elias
not clear logical widths dirty bit without computing the value"" into klp-dev * commit '8dc37564812e5651db9b65ad3394e8bbe1d2ee4e': Cherry-pick http://crrev.com/27262002 "Should not clear logical widths dirty bit without computing the value"
2013-12-05am 53e40d0c: (-s ours) Merge "Use magic number 320 for viewport width ↵Alexandre Elias
snapping." into klp-dev * commit '53e40d0cb745358e2e1a432cb90a3652745e4d96': Use magic number 320 for viewport width snapping.
2013-12-05am d21d6395: (-s ours) Merge "Add a quirk for merging multiple <meta ↵Jonathan Dixon
viewport> tags" into klp-dev * commit 'd21d63954c04bfbb424d03442d3af34a0777d6b1': Add a quirk for merging multiple <meta viewport> tags
2013-12-05am 397ad14a: (-s ours) Cherry-pick http://crrev.com/26299006 "Fixes for ↵Alexandre Elias
small width/height values in Android WebView quirks mode." * commit '397ad14ad328484f0bf542b93cbfa000434e7ce1': Cherry-pick http://crrev.com/26299006 "Fixes for small width/height values in Android WebView quirks mode."
2013-12-05am 45a1a6ad: (-s ours) Cherry-pick http://crrev.com/27041003 "Fix ↵Alexandre Elias
non-useWideViewport initial-scale for Android WebView CTS test." * commit '45a1a6ad8e0ea4197b2353b5e3d869e763967654': Cherry-pick http://crrev.com/27041003 "Fix non-useWideViewport initial-scale for Android WebView CTS test."
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 02:08:44 +0000