summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-05-02Merge "Merge up to 24c4a3d7 from chromium-dev."idea133-weekly-releaseSelim Gurun
2014-05-01Merge up to 24c4a3d7 from chromium-dev.Bo Liu
2014-04-29Merge "Add waitForCompletion to requestDrawGL" into chromium-devBart Sears
2014-04-29Add waitForCompletion to requestDrawGLBo Liu
2014-04-23Merge "Merge up to 2e8d713 from chromium-dev."Conley Owens
2014-04-16Merge up to 2e8d713 from chromium-dev.Torne (Richard Coles)
2014-04-02Merge "Restore accidentally removed translations."Torne (Richard Coles)
2014-04-01Restore accidentally removed translations.Torne (Richard Coles)
2014-03-25Merge "Fix JNI for jint to jlong conversion" into chromium-devBen Murdoch
2014-03-25Fix JNI for jint to jlong conversionRoss McIlroy
2014-03-24Merge " Convert jint to jlong for native pointers in GLFunctionTable to suppo...Richard Coles
2014-03-24 Convert jint to jlong for native pointers in GLFunctionTable to support 64 bRoss McIlroy
2014-03-24Merge "Revert "Convert jint to jlong for native pointers in GLFunctionTable t...Richard Coles
2014-03-24Revert "Convert jint to jlong for native pointers in GLFunctionTable to suppo...Richard Coles
2014-03-24Merge "Convert jint to jlong for native pointers in GLFunctionTable to suppor...Richard Coles
2014-03-24Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit.Ross McIlroy
2014-03-21Merge "Fix jni strings after converting to long" into chromium-devBen Murdoch
2014-03-21Fix jni strings after converting to longBo Liu
2014-03-21Merge "Convert points to long" into chromium-devBen Murdoch
2014-03-21Convert points to longBo Liu
2014-03-21Merge "Pass layer type to AwContents when WebView calls setLayerType" into ch...Richard Coles
2014-03-21Pass layer type to AwContents when WebView calls setLayerTypeJin Yang
2014-03-04Merge "Make executeHardwareAction avaiable to AwContents" into chromium-devBart Sears
2014-03-03Make executeHardwareAction avaiable to AwContentsBo Liu
2014-02-26Merge "Update resources added in Chromium r253153" into chromium-devRichard Coles
2014-02-25Update resources added in Chromium r253153Bo Liu
2014-02-12Merge "Fix the JarJar path selection mechanism." into chromium-devRichard Coles
2014-02-12Fix the JarJar path selection mechanism.Marcin Kosiba
2014-02-12Merge "Reflect library loader move to base." into chromium-devRichard Coles
2014-02-12Reflect library loader move to base.Marcin Kosiba
2014-02-12Merge "Update resources to match changes in upstream Chromium." into chromium...Ben Murdoch
2014-02-12Merge "Reflect print API changes" into chromium-devBen Murdoch
2014-02-12Merge "Make the AOSP + Chromium workflow simpler." into chromium-devBen Murdoch
2014-02-12Merge changes I70aed30a,Ib74f8d7a into chromium-devBen Murdoch
2014-02-12Merge "Make the onScrollChange implementation a no-op." into chromium-devBen Murdoch
2014-02-12Merge "Remove dependency on UniquePtr." into chromium-devBen Murdoch
2014-02-12Merge "Reflect move of CommandLine from content/ to base/" into chromium-devBen Murdoch
2014-02-12Merge "Stop using the test constructor." into chromium-devBen Murdoch
2014-02-12Merge "Remove a not dangerous warning from skia header files" into chromium-devBen Murdoch
2014-02-12Merge "Tidy up WebViewChromiumFactoryProvider." into chromium-devBen Murdoch
2014-02-10Update resources to match changes in upstream Chromium.Marcin Kosiba
2014-02-10Reflect print API changesMarcin Kosiba
2014-02-10Make the AOSP + Chromium workflow simpler.Marcin Kosiba
2014-02-10Switch ResourceProvider to use new setters from AwResourcesMikhail Naganov
2014-02-10Make the onScrollChange implementation a no-op.Martin Kosiba
2014-02-10Remove dependency on UniquePtr.Ben Murdoch
2014-02-10Don't strip ColorPicker resources referenced from XML.Ben Murdoch
2014-02-10Reflect move of CommandLine from content/ to base/Ben Murdoch
2014-02-07Stop using the test constructor.Martin Kosiba
2014-02-07Remove a not dangerous warning from skia header filesKristian Monsen