diff options
author | Steve Block <steveblock@google.com> | 2010-09-21 19:03:24 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-09-29 17:45:33 +0100 |
commit | 8de7ac488df2f39f82e56811541f4847b3f2e952 (patch) | |
tree | deaaf69de23d3ecbb3b8ed41e89d341bca4990df /WebCore/rendering | |
parent | 68513a70bcd92384395513322f1b801e7bf9c729 (diff) | |
download | external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.zip external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.tar.gz external_webkit-8de7ac488df2f39f82e56811541f4847b3f2e952.tar.bz2 |
Merge WebKit at r67908: Fix conflicts
Whitespace difference in config.h - http://trac.webkit.org/changeset/67323
- WebCore/config.h
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882
- WebCore/css/CSSComputedStyleDeclaration.cpp
Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704
- WebCore/css/CSSParser.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667
- WebCore/css/CSSParser.cpp
- WebCore/css/CSSStyleSelector.cpp
Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292
- WebCore/dom/Document.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903
- WebCore/html/HTMLInputElement.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198
- WebCore/loader/DocumentLoader.cpp
- WebCore/loader/FrameLoader.cpp
Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253
- WebCore/loader/FrameLoader.cpp
Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762
- WebCore/page/DOMWindow.cpp
Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890
- WebCore/page/Settings.cpp
- WebCore/page/Settings.h
Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375
- WebCore/platform/MIMETypeRegistry.cpp
Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325
- WebCore/plugins/PluginView.cpp
Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660
- WebCore/rendering/RenderBox.h
- WebCore/rendering/RenderTable.cpp
Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862
- WebCore/rendering/RenderTableCell.cpp
Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667
- WebCore/rendering/style/RenderStyle.h
Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c
fix conflicts
Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
Diffstat (limited to 'WebCore/rendering')
-rw-r--r-- | WebCore/rendering/RenderBlockLineLayout.cpp | 45 | ||||
-rw-r--r-- | WebCore/rendering/RenderBox.h | 7 | ||||
-rw-r--r-- | WebCore/rendering/RenderTable.cpp | 9 | ||||
-rw-r--r-- | WebCore/rendering/RenderTableCell.cpp | 20 | ||||
-rw-r--r-- | WebCore/rendering/style/RenderStyle.h | 8 |
5 files changed, 32 insertions, 57 deletions
diff --git a/WebCore/rendering/RenderBlockLineLayout.cpp b/WebCore/rendering/RenderBlockLineLayout.cpp index 3cd944b..c43f2a8 100644 --- a/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/WebCore/rendering/RenderBlockLineLayout.cpp @@ -614,43 +614,46 @@ void RenderBlock::layoutInlineChildren(bool relayoutChildren, int& repaintTop, i if (o->isPositioned()) o->containingBlock()->insertPositionedObject(box); -<<<<<<< HEAD +#if PLATFORM(ANDROID) else { #ifdef ANDROID_LAYOUT // ignore text wrap for textField or menuList - if (doTextWrap && (o->isTextField() || o->isMenuList())) - doTextWrap = false; + if (doTextWrap && (o->isTextField() || o->isMenuList())) + doTextWrap = false; #endif if (o->isFloating()) floats.append(FloatWithRect(box)); - else if (fullLayout || o->needsLayout()) // Replaced elements + else if (fullLayout || o->needsLayout()) { + // Replaced elements toRenderBox(o)->dirtyLineBoxes(fullLayout); - #if defined(ANDROID_FLATTEN_IFRAME) || defined(ANDROID_FLATTEN_FRAMESET) - // Android frame flattening during layout() may cause the - // renderer to be destroyed, if for example a frames onresize handler - // deletes the frame - see http://trac.webkit.org/changeset/61070 for example. - // We may be able to remove this protector when we switch to the upstream - // frame flattening code. In the case of an anonymous render object like RenderListMarker - // the document is the DOM node associated with this RenderObject. - RefPtr<Node> protector(o->isAnonymous() ? o->document() : o->node()); + // Android frame flattening during layout() may cause the + // renderer to be destroyed, if for example a frames onresize handler + // deletes the frame - see http://trac.webkit.org/changeset/61070 for example. + // We may be able to remove this protector when we switch to the upstream + // frame flattening code. In the case of an anonymous render object like RenderListMarker + // the document is the DOM node associated with this RenderObject. + RefPtr<Node> protector(o->isAnonymous() ? o->document() : o->node()); +#endif + o->layoutIfNeeded(); +#if defined(ANDROID_FLATTEN_IFRAME) || defined(ANDROID_FLATTEN_FRAMESET) + // Ensure that the renderer still exists. If it's gone away we will crash pretty + // fast by continuing to use the now invalid o pointer. If the renderer has gone, + // then there's no point in continuing to try to layout it's children so we break. + if (!protector->renderer()) + break; #endif -======= + } + } +#else else if (o->isFloating()) floats.append(FloatWithRect(box)); else if (fullLayout || o->needsLayout()) { // Replaced elements toRenderBox(o)->dirtyLineBoxes(fullLayout); ->>>>>>> webkit.org at r67908 o->layoutIfNeeded(); -#if defined(ANDROID_FLATTEN_IFRAME) || defined(ANDROID_FLATTEN_FRAMESET) - // Ensure that the renderer still exists. If it's gone away we will crash pretty - // fast by continuing to use the now invalid o pointer. If the renderer has gone, - // then there's no point in continuing to try to layout it's children so we break. - if (!protector->renderer()) - break; -#endif } +#endif // PLATFORM(ANDROID) } else if (o->isText() || (o->isRenderInline() && !endOfInline)) { if (fullLayout || o->selfNeedsLayout()) dirtyLineBoxesForRenderer(o, fullLayout); diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h index dc1eb96..b008c09 100644 --- a/WebCore/rendering/RenderBox.h +++ b/WebCore/rendering/RenderBox.h @@ -298,15 +298,12 @@ public: bool shrinkToAvoidFloats() const; virtual bool avoidsFloats() const; -<<<<<<< HEAD + virtual void markDescendantBlocksAndLinesForLayout(bool inLayout = true); + #ifdef ANDROID_LAYOUT int getVisibleWidth() const { return m_visibleWidth; } #endif -======= - virtual void markDescendantBlocksAndLinesForLayout(bool inLayout = true); - ->>>>>>> webkit.org at r67908 protected: virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle); virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp index 124dacb..931cf45 100644 --- a/WebCore/rendering/RenderTable.cpp +++ b/WebCore/rendering/RenderTable.cpp @@ -62,16 +62,13 @@ RenderTable::RenderTable(Node* node) , m_borderLeft(0) , m_borderRight(0) { -<<<<<<< HEAD -#ifdef ANDROID_LAYOUT - m_singleColumn = false; -#endif -======= setChildrenInline(false); ->>>>>>> webkit.org at r67908 m_columnPos.fill(0, 2); m_columns.fill(ColumnStruct(), 1); +#ifdef ANDROID_LAYOUT + m_singleColumn = false; +#endif } void RenderTable::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle) diff --git a/WebCore/rendering/RenderTableCell.cpp b/WebCore/rendering/RenderTableCell.cpp index add2b5e..66d1d7b 100644 --- a/WebCore/rendering/RenderTableCell.cpp +++ b/WebCore/rendering/RenderTableCell.cpp @@ -795,27 +795,7 @@ static int compareBorderStylesForQSort(const void* pa, const void* pb) const CollapsedBorderValue* b = static_cast<const CollapsedBorderValue*>(pb); if (*a == *b) return 0; -<<<<<<< HEAD - CollapsedBorderValue borderWithHigherPrecedence = compareBorders(*a, *b); -#ifdef ANDROID_FIX - if (*a == borderWithHigherPrecedence) { - // klibc uses a combsort for quicksort and requires that two values always give the same answer - // regardless of comparison order. Unfortunately, compareBorders does not honor that requirement. - // Call compareBorders again with reversed parameters. If it returns the first value again then - // we can assume the values are equal. http://bugs.webkit.org/show_bug.cgi?id=13147 - CollapsedBorderValue qSortHack = compareBorders(*b, *a); - if (*b == qSortHack) - return 0; - return 1; - } -#else - if (*a == borderWithHigherPrecedence) - return 1; -#endif - return -1; -======= return compareBorders(*a, *b); ->>>>>>> webkit.org at r67908 } void RenderTableCell::sortBorderStyles(CollapsedBorderStyles& borderStyles) diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h index e287ab9..e6e6318 100644 --- a/WebCore/rendering/style/RenderStyle.h +++ b/WebCore/rendering/style/RenderStyle.h @@ -738,7 +738,9 @@ public: bool textSizeAdjust() const { return rareInheritedData->textSizeAdjust; } ETextSecurity textSecurity() const { return static_cast<ETextSecurity>(rareInheritedData->textSecurity); } -<<<<<<< HEAD + EBlockFlowDirection blockFlow() const { return static_cast<EBlockFlowDirection>(inherited_flags._blockFlow); } + bool isVerticalBlockFlow() const { return blockFlow() == TopToBottomBlockFlow || blockFlow() == BottomToTopBlockFlow; } + #ifdef ANDROID_CSS_RING // called when building nav cache to determine if the ring data is unchanged const void* ringData() const { return reinterpret_cast<const void*>(rareInheritedData.get()); } @@ -755,10 +757,6 @@ public: #ifdef ANDROID_CSS_TAP_HIGHLIGHT_COLOR Color tapHighlightColor() const { return rareInheritedData->tapHighlightColor; } #endif -======= - EBlockFlowDirection blockFlow() const { return static_cast<EBlockFlowDirection>(inherited_flags._blockFlow); } - bool isVerticalBlockFlow() const { return blockFlow() == TopToBottomBlockFlow || blockFlow() == BottomToTopBlockFlow; } ->>>>>>> webkit.org at r67908 // attribute setter methods |