diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-08-12 03:11:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-12 03:11:07 -0700 |
| commit | 6a94579dab1dca12e6555b01602efeb5debda17a (patch) | |
| tree | bef4ab2636bef2efa76ab8ab56d270b1b88fb892 | |
| parent | 11d8c63740ed4cc8f20c58d18343953879868d17 (diff) | |
| parent | 09750f5c829979ca6fc0c740459029d3f606b734 (diff) | |
| download | external_webkit-6a94579dab1dca12e6555b01602efeb5debda17a.zip external_webkit-6a94579dab1dca12e6555b01602efeb5debda17a.tar.gz external_webkit-6a94579dab1dca12e6555b01602efeb5debda17a.tar.bz2 | |
Merge changes I08b329cd,I06a7975d
* changes:
Part of fix for bug 5152544 Reduce the number of warning, int and size_t
Part of fix for bug 5152544 Reduce the number of warning
| -rw-r--r-- | Source/WebCore/rendering/RenderLayerCompositor.cpp | 6 | ||||
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp index b8e30cb..e757080 100644 --- a/Source/WebCore/rendering/RenderLayerCompositor.cpp +++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp @@ -621,10 +621,10 @@ bool RenderLayerCompositor::overlapsCompositedLayers(OverlapMap& overlapMap, con // bool RenderLayerCompositor::checkForFixedLayers(Vector<RenderLayer*>* list, bool stopAtFixedLayer) { - size_t listSize = list->size(); + int listSize = list->size(); int haveFixedLayer = -1; bool fixedSibling = false; - for (size_t j = 0; j < listSize; ++j) { + for (int j = 0; j < listSize; ++j) { RenderLayer* currentLayer = list->at(j); if (currentLayer->isFixed() && needsToBeComposited(currentLayer)) { haveFixedLayer = j; @@ -644,7 +644,7 @@ bool RenderLayerCompositor::checkForFixedLayers(Vector<RenderLayer*>* list, bool if (stopAtFixedLayer) stop = haveFixedLayer + 1; - for (size_t k = j - 1; k >= stop; --k) { + for (int k = j - 1; k >= stop; --k) { RenderLayer* aLayer = list->at(k); if (aLayer && aLayer->renderer()) { IntRect bounds = aLayer->renderer()->localToAbsoluteQuad( diff --git a/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp b/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp index 65b6771..e837244 100644 --- a/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/autofill/FormManagerAndroid.cpp @@ -116,7 +116,7 @@ bool IsOptionElement(Element& element) { bool IsAutofillableElement(const HTMLFormControlElement& element) { HTMLInputElement* html_input_element = HTMLFormControlElementToHTMLInputElement(element); - return html_input_element && IsTextInput(html_input_element) || IsSelectElement(element); + return (html_input_element && IsTextInput(html_input_element)) || IsSelectElement(element); } // This is a helper function for the FindChildText() function (see below). |