diff options
| author | George Mount <mount@google.com> | 2012-04-30 12:49:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-30 12:49:29 -0700 |
| commit | 36fac086d9c2904c6d267b797f5ac2ceaa919ace (patch) | |
| tree | 821de342422fb88e308d20196cd3c17e449c3ff0 | |
| parent | f78f45e5afb06ade1556cd3f5cc9634532a90034 (diff) | |
| parent | 940c47782e72ed37ba9f1193af1265a56a3df7e1 (diff) | |
| download | external_webkit-36fac086d9c2904c6d267b797f5ac2ceaa919ace.zip external_webkit-36fac086d9c2904c6d267b797f5ac2ceaa919ace.tar.gz external_webkit-36fac086d9c2904c6d267b797f5ac2ceaa919ace.tar.bz2 | |
am 940c4778: Changes from code comments.
* commit '940c47782e72ed37ba9f1193af1265a56a3df7e1':
Changes from code comments.
| -rw-r--r-- | Source/WebCore/html/shadow/SliderThumbElement.cpp | 3 | ||||
| -rw-r--r-- | Source/WebCore/platform/android/RenderThemeAndroid.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index 6f4fedb..1c2af79 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -94,7 +94,8 @@ public: { return adoptRef(new SliderTouchEventListener(slider)); } - virtual bool operator==(const EventListener& other) { + virtual bool operator==(const EventListener& other) + { return this == &other; } virtual void handleEvent(ScriptExecutionContext*, Event* event) diff --git a/Source/WebCore/platform/android/RenderThemeAndroid.cpp b/Source/WebCore/platform/android/RenderThemeAndroid.cpp index f8e1950..86380e7 100644 --- a/Source/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/Source/WebCore/platform/android/RenderThemeAndroid.cpp @@ -439,8 +439,8 @@ void RenderThemeAndroid::adjustSliderThumbSize(RenderObject* o) const { static const int sliderThumbWidth = RenderSkinMediaButton::sliderThumbWidth(); static const int sliderThumbHeight = RenderSkinMediaButton::sliderThumbHeight(); - o->style()->setWidth(Length(sliderThumbHeight, Fixed)); - o->style()->setHeight(Length(sliderThumbWidth, Fixed)); + o->style()->setWidth(Length(sliderThumbWidth, Fixed)); + o->style()->setHeight(Length(sliderThumbHeight, Fixed)); } #endif |