diff options
| -rw-r--r-- | WebCore/config.h | 4 | ||||
| -rw-r--r-- | WebCore/css/CSSComputedStyleDeclaration.cpp | 6 | ||||
| -rw-r--r-- | WebCore/css/CSSParser.cpp | 43 | ||||
| -rw-r--r-- | WebCore/css/CSSStyleSelector.cpp | 96 | ||||
| -rw-r--r-- | WebCore/dom/Document.cpp | 5 | ||||
| -rw-r--r-- | WebCore/html/HTMLInputElement.cpp | 8 | ||||
| -rw-r--r-- | WebCore/loader/DocumentLoader.cpp | 2 | ||||
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 21 | ||||
| -rw-r--r-- | WebCore/page/DOMWindow.cpp | 32 | ||||
| -rw-r--r-- | WebCore/page/Settings.cpp | 5 | ||||
| -rw-r--r-- | WebCore/page/Settings.h | 5 | ||||
| -rw-r--r-- | WebCore/platform/MIMETypeRegistry.cpp | 6 | ||||
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 5 | ||||
| -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 |
18 files changed, 115 insertions, 212 deletions
diff --git a/WebCore/config.h b/WebCore/config.h index 8a82914..f88ad3b 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -315,12 +315,8 @@ typedef float CGFloat; #if PLATFORM(WIN) && PLATFORM(CG) #define WTF_USE_SAFARI_THEME 1 #endif -<<<<<<< HEAD -======= #if PLATFORM(QT) && USE(V8) && defined(Q_WS_X11) /* protect ourselves from evil X11 defines */ #include <bridge/npruntime_internal.h> #endif - ->>>>>>> webkit.org at r67908 diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp index 369ece9..3746464 100644 --- a/WebCore/css/CSSComputedStyleDeclaration.cpp +++ b/WebCore/css/CSSComputedStyleDeclaration.cpp @@ -753,14 +753,10 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper if (!style) return 0; -<<<<<<< HEAD - propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction()); + propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->blockFlow()); #ifdef ANDROID_LAYOUT const Settings * settings = node->document()->frame() ? node->document()->frame()->settings() : 0; #endif -======= - propertyID = CSSProperty::resolveDirectionAwareProperty(propertyID, style->direction(), style->blockFlow()); ->>>>>>> webkit.org at r67908 switch (static_cast<CSSPropertyID>(propertyID)) { case CSSPropertyInvalid: diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp index d4fb713..502bc77 100644 --- a/WebCore/css/CSSParser.cpp +++ b/WebCore/css/CSSParser.cpp @@ -377,15 +377,13 @@ void CSSParser::parseSelector(const String& string, Document* doc, CSSSelectorLi bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const String& string, CSSStyleSourceData* styleSourceData) { -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::CSSParseTimeCounter); #endif -======= + // Length of the "@-webkit-decls{" prefix. static const unsigned prefixLength = 15; ->>>>>>> webkit.org at r67908 ASSERT(!declaration->stylesheet() || declaration->stylesheet()->isCSSStyleSheet()); m_styleSheet = static_cast<CSSStyleSheet*>(declaration->stylesheet()); m_currentStyleData = styleSourceData; @@ -403,11 +401,6 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const clearProperties(); } -<<<<<<< HEAD -#ifdef ANDROID_INSTRUMENT - android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__); -#endif -======= if (m_currentStyleData) { m_currentStyleData->styleBodyRange.start = 0; m_currentStyleData->styleBodyRange.end = string.length(); @@ -419,7 +412,11 @@ bool CSSParser::parseDeclaration(CSSMutableStyleDeclaration* declaration, const if (!m_ruleRangeMap) m_currentStyleData = 0; ->>>>>>> webkit.org at r67908 + +#ifdef ANDROID_INSTRUMENT + android::TimeCounter::record(android::TimeCounter::CSSParseTimeCounter, __FUNCTION__); +#endif + return ok; } @@ -1828,7 +1825,19 @@ bool CSSParser::parseValue(int propId, bool important) break; #endif -<<<<<<< HEAD + // CSS Text Layout Module Level 3: Vertical writing support + case CSSPropertyWebkitBlockFlow: + // [ "tb" | "rl" | "lr" | "bt" ] + if (id == CSSValueTb || id == CSSValueRl || id == CSSValueLr || id == CSSValueBt) + validPrimitive = true; + break; + + case CSSPropertyWebkitWritingMode: + // [ "lr-tb" | "rl-tb" | "tb-rl" | "bt-rl" | "tb-lr" | "bt-lr" ] + if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueBtRl || id == CSSValueTbLr || id == CSSValueBtLr) + validPrimitive = true; + break; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1866,20 +1875,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - // CSS Text Layout Module Level 3: Vertical writing support - case CSSPropertyWebkitBlockFlow: - // [ "tb" | "rl" | "lr" | "bt" ] - if (id == CSSValueTb || id == CSSValueRl || id == CSSValueLr || id == CSSValueBt) - validPrimitive = true; - break; - - case CSSPropertyWebkitWritingMode: - // [ "lr-tb" | "rl-tb" | "tb-rl" | "bt-rl" | "tb-lr" | "bt-lr" ] - if (id == CSSValueLrTb || id == CSSValueRlTb || id == CSSValueTbRl || id == CSSValueBtRl || id == CSSValueTbLr || id == CSSValueBtLr) - validPrimitive = true; - break; ->>>>>>> webkit.org at r67908 #if ENABLE(SVG) default: diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp index abc4c22..9b51fdb 100644 --- a/WebCore/css/CSSStyleSelector.cpp +++ b/WebCore/css/CSSStyleSelector.cpp @@ -5539,7 +5539,53 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; #endif -<<<<<<< HEAD + // CSS Text Layout Module Level 3: Vertical writing support + case CSSPropertyWebkitBlockFlow: + HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(blockFlow, BlockFlow) + return; + + case CSSPropertyWebkitWritingMode: + // The 'writing-mode' property is a shorthand property for the 'direction' property and the 'block-flow' property. + if (isInherit) { + m_style->setDirection(m_parentStyle->direction()); + m_style->setBlockFlow(m_parentStyle->blockFlow()); + } else if (isInitial) { + m_style->setDirection(m_style->initialDirection()); + m_style->setBlockFlow(m_style->initialBlockFlow()); + } else { + if (!primitiveValue) + return; + switch (primitiveValue->getIdent()) { + case CSSValueLrTb: + m_style->setDirection(LTR); + m_style->setBlockFlow(TopToBottomBlockFlow); + break; + case CSSValueRlTb: + m_style->setDirection(RTL); + m_style->setBlockFlow(TopToBottomBlockFlow); + break; + case CSSValueTbRl: + m_style->setDirection(LTR); + m_style->setBlockFlow(RightToLeftBlockFlow); + break; + case CSSValueBtRl: + m_style->setDirection(RTL); + m_style->setBlockFlow(RightToLeftBlockFlow); + break; + case CSSValueTbLr: + m_style->setDirection(LTR); + m_style->setBlockFlow(LeftToRightBlockFlow); + break; + case CSSValueBtLr: + m_style->setDirection(RTL); + m_style->setBlockFlow(LeftToRightBlockFlow); + break; + default: + break; + } + } + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -5683,54 +5729,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - // CSS Text Layout Module Level 3: Vertical writing support - case CSSPropertyWebkitBlockFlow: - HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(blockFlow, BlockFlow) - return; - - case CSSPropertyWebkitWritingMode: - // The 'writing-mode' property is a shorthand property for the 'direction' property and the 'block-flow' property. - if (isInherit) { - m_style->setDirection(m_parentStyle->direction()); - m_style->setBlockFlow(m_parentStyle->blockFlow()); - } else if (isInitial) { - m_style->setDirection(m_style->initialDirection()); - m_style->setBlockFlow(m_style->initialBlockFlow()); - } else { - if (!primitiveValue) - return; - switch (primitiveValue->getIdent()) { - case CSSValueLrTb: - m_style->setDirection(LTR); - m_style->setBlockFlow(TopToBottomBlockFlow); - break; - case CSSValueRlTb: - m_style->setDirection(RTL); - m_style->setBlockFlow(TopToBottomBlockFlow); - break; - case CSSValueTbRl: - m_style->setDirection(LTR); - m_style->setBlockFlow(RightToLeftBlockFlow); - break; - case CSSValueBtRl: - m_style->setDirection(RTL); - m_style->setBlockFlow(RightToLeftBlockFlow); - break; - case CSSValueTbLr: - m_style->setDirection(LTR); - m_style->setBlockFlow(LeftToRightBlockFlow); - break; - case CSSValueBtLr: - m_style->setDirection(RTL); - m_style->setBlockFlow(LeftToRightBlockFlow); - break; - default: - break; - } - } - return; ->>>>>>> webkit.org at r67908 #if ENABLE(SVG) default: diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index 262dad2..180b943 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -441,15 +441,12 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, con if (frame || !url.isEmpty()) setURL(url); -<<<<<<< HEAD -#if !PLATFORM(ANDROID) -======= // Setting of m_baseURL needs to happen after the setURL call, since that // calls updateBaseURL, which would clobber the passed in value. if (!baseURL.isNull()) m_baseURL = baseURL; ->>>>>>> webkit.org at r67908 +#if !PLATFORM(ANDROID) m_axObjectCache = 0; #endif diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp index a44b68c..67b0c03 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -889,16 +889,12 @@ static PassOwnPtr<InputTypeMap> createTypeMap() void HTMLInputElement::updateType() { static const InputTypeMap* typeMap = createTypeMap().leakPtr(); -<<<<<<< HEAD - InputType newType = t.isNull() ? TEXT : typeMap->get(t); + const AtomicString& typeString = fastGetAttribute(typeAttr); + DeprecatedInputType newType = typeString.isEmpty() ? TEXT : typeMap->get(typeString); #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS if (newType == PASSWORD && document()->focusedNode() == this) android::WebViewCore::getWebViewCore(document()->view())->updateTextfield(this, true, String()); #endif -======= - const AtomicString& typeString = fastGetAttribute(typeAttr); - DeprecatedInputType newType = typeString.isEmpty() ? TEXT : typeMap->get(typeString); ->>>>>>> webkit.org at r67908 // IMPORTANT: Don't allow the type to be changed to FILE after the first // type change, otherwise a JavaScript programmer would be able to set a text diff --git a/WebCore/loader/DocumentLoader.cpp b/WebCore/loader/DocumentLoader.cpp index b0c0e0a..91316a5 100644 --- a/WebCore/loader/DocumentLoader.cpp +++ b/WebCore/loader/DocumentLoader.cpp @@ -286,8 +286,10 @@ void DocumentLoader::commitLoad(const char* data, int length) FrameLoader* frameLoader = DocumentLoader::frameLoader(); if (!frameLoader) return; +#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size if (ArchiveFactory::isArchiveMimeType(response().mimeType())) return; +#endif frameLoader->client()->committedLoad(this, data, length); } diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 35909ea..722f02f 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -2263,17 +2263,10 @@ void FrameLoader::finishedLoadingDocument(DocumentLoader* loader) String userChosenEncoding = documentLoader()->overrideEncoding(); bool encodingIsUserChosen = !userChosenEncoding.isNull(); writer()->setEncoding(encodingIsUserChosen ? userChosenEncoding : mainResource->textEncoding(), encodingIsUserChosen); -<<<<<<< HEAD - - ASSERT(m_frame->document()); - - addData(mainResource->data()->data(), mainResource->data()->size()); + writer()->addData(mainResource->data()->data(), mainResource->data()->size()); #else m_client->finishedLoading(loader); #endif // ARCHIVE -======= - writer()->addData(mainResource->data()->data(), mainResource->data()->size()); ->>>>>>> webkit.org at r67908 } bool FrameLoader::isReplacing() const @@ -2732,18 +2725,6 @@ void FrameLoader::addHTTPOriginIfNeeded(ResourceRequest& request, String origin) request.setHTTPOrigin(origin); } -<<<<<<< HEAD -void FrameLoader::committedLoad(DocumentLoader* loader, const char* data, int length) -{ -#if ENABLE(ARCHIVE) // ANDROID extension: disabled to reduce code size - if (ArchiveFactory::isArchiveMimeType(loader->response().mimeType())) - return; -#endif - m_client->committedLoad(loader, data, length); -} - -======= ->>>>>>> webkit.org at r67908 void FrameLoader::loadPostRequest(const ResourceRequest& inRequest, const String& referrer, const String& frameName, bool lockHistory, FrameLoadType loadType, PassRefPtr<Event> event, PassRefPtr<FormState> prpFormState) { RefPtr<FormState> formState = prpFormState; diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp index 310ab25..afd6bc7 100644 --- a/WebCore/page/DOMWindow.cpp +++ b/WebCore/page/DOMWindow.cpp @@ -1053,15 +1053,11 @@ int DOMWindow::innerHeight() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualHeight() / view->pageZoomFactor()); + return static_cast<int>(view->actualHeight() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->height() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->height() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::innerWidth() const @@ -1073,15 +1069,11 @@ int DOMWindow::innerWidth() const if (!view) return 0; -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualWidth() / view->pageZoomFactor()); + return static_cast<int>(view->actualWidth() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->width() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->width() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::screenX() const @@ -1119,15 +1111,11 @@ int DOMWindow::scrollX() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollX() / view->pageZoomFactor()); + return static_cast<int>(view->actualScrollX() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->scrollX() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollX() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } int DOMWindow::scrollY() const @@ -1141,15 +1129,11 @@ int DOMWindow::scrollY() const m_frame->document()->updateLayoutIgnorePendingStylesheets(); -<<<<<<< HEAD #if PLATFORM(ANDROID) - return static_cast<int>(view->actualScrollY() / view->pageZoomFactor()); + return static_cast<int>(view->actualScrollY() / m_frame->pageZoomFactor()); #else - return static_cast<int>(view->scrollY() / view->pageZoomFactor()); -#endif -======= return static_cast<int>(view->scrollY() / m_frame->pageZoomFactor()); ->>>>>>> webkit.org at r67908 +#endif } bool DOMWindow::closed() const diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp index 147e9e1..faa7140 100644 --- a/WebCore/page/Settings.cpp +++ b/WebCore/page/Settings.cpp @@ -158,16 +158,13 @@ Settings::Settings(Page* page) #endif , m_memoryInfoEnabled(false) , m_interactiveFormValidation(false) -<<<<<<< HEAD + , m_usePreHTML5ParserQuirks(false) #if ENABLE(WEB_AUTOFILL) , m_autoFillEnabled(false) #endif #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif -======= - , m_usePreHTML5ParserQuirks(false) ->>>>>>> webkit.org at r67908 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. diff --git a/WebCore/page/Settings.h b/WebCore/page/Settings.h index a0d07ff..b0a964d 100644 --- a/WebCore/page/Settings.h +++ b/WebCore/page/Settings.h @@ -527,16 +527,13 @@ namespace WebCore { #endif bool m_memoryInfoEnabled: 1; bool m_interactiveFormValidation: 1; -<<<<<<< HEAD + bool m_usePreHTML5ParserQuirks: 1; #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif #if ENABLE(WEB_AUTOFILL) bool m_autoFillEnabled: 1; #endif -======= - bool m_usePreHTML5ParserQuirks: 1; ->>>>>>> webkit.org at r67908 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp index a99c448..0ae1389 100644 --- a/WebCore/platform/MIMETypeRegistry.cpp +++ b/WebCore/platform/MIMETypeRegistry.cpp @@ -109,10 +109,6 @@ static void initializeSupportedImageMIMETypes() supportedImageResourceMIMETypes->add(mimeType); } } -<<<<<<< HEAD - - supportedImageMIMETypes->remove("application/octet-stream"); - supportedImageResourceMIMETypes->remove("application/octet-stream"); #elif PLATFORM(ANDROID) static const char* types[] = { "image/jpeg", @@ -135,8 +131,6 @@ static void initializeSupportedImageMIMETypes() #if !ENABLE(XSLT) supportedNonImageMIMETypes->remove("text/xsl"); #endif -======= ->>>>>>> webkit.org at r67908 #else // assume that all implementations at least support the following standard // image types: diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 0413b21..ca358b7 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -1490,11 +1490,6 @@ void PluginView::privateBrowsingStateChanged(bool privateBrowsingEnabled) return; PluginView::setCurrentPluginView(this); -<<<<<<< HEAD -// ANDROID -// Upstream to webkit.org -======= ->>>>>>> webkit.org at r67908 #if USE(JSC) JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); #endif 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 |