OSDN Git Service

Merge "We be GL ringing it all over them layers"
authorJohn Reck <jreck@google.com>
Mon, 19 Sep 2011 18:07:26 +0000 (11:07 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Sep 2011 18:07:26 +0000 (11:07 -0700)
commitc6c775bd2d833243230713c1311a912bc755e1d7
tree34378b5705e00114aa854df9712eb7f2beae47ba
parentded168b48160e6f9acd23646987f32d625fb64d7
parent73b4552f8e4e89529f6f44378b80a31f764c1377
Merge "We be GL ringing it all over them layers"
Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
Source/WebKit/android/nav/WebView.cpp