OSDN Git Service

Merge changes Ifb6cc64e,I4d819cc5
authorSteve Block <steveblock@google.com>
Mon, 19 Sep 2011 23:16:31 +0000 (16:16 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 19 Sep 2011 23:16:31 +0000 (16:16 -0700)
commitdfd464c5416bf18e36a34102c51e1c39dd9fa886
tree8db6b84a2c18d2b9bd10867f245f2cb894e099f1
parent41247753e4166d9b2ad11c976b9ff0f9152b4150
parenta307a97864647f6373c599f917e762a5fee3a197
Merge changes Ifb6cc64e,I4d819cc5

* changes:
  Simplify logic in ScrollableLayerAndroid::scrollTo()
  Fixes style and adds some comments to layers code
Source/WebCore/platform/graphics/android/LayerAndroid.cpp
Source/WebCore/platform/graphics/android/LayerAndroid.h
Source/WebKit/android/nav/WebView.cpp