diff options
author | Steve Block <steveblock@google.com> | 2011-06-08 10:42:08 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:52:18 +0100 |
commit | 74ee772b3c1ea8b557e5a596e9cbc655d1c0e161 (patch) | |
tree | 0dfdf14b9450bf2a2cc45dc7b335ef390ba38683 /Source | |
parent | bafa44a9b9f47c1487cf18754bbcc6292c372fb6 (diff) | |
download | external_webkit-74ee772b3c1ea8b557e5a596e9cbc655d1c0e161.zip external_webkit-74ee772b3c1ea8b557e5a596e9cbc655d1c0e161.tar.gz external_webkit-74ee772b3c1ea8b557e5a596e9cbc655d1c0e161.tar.bz2 |
Merge WebKit at r82507: Fix conflicts
- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715
- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797
- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695
- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635
- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874
- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716
- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981
- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378
- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684
- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054
- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835
- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216
- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.
Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/css/CSSParser.cpp | 28 | ||||
-rw-r--r-- | Source/WebCore/css/CSSStyleSelector.cpp | 104 | ||||
-rw-r--r-- | Source/WebCore/dom/Document.cpp | 6 | ||||
-rw-r--r-- | Source/WebCore/dom/Document.h | 8 | ||||
-rw-r--r-- | Source/WebCore/dom/StyleElement.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/html/shadow/MediaControls.cpp | 20 | ||||
-rw-r--r-- | Source/WebCore/html/shadow/SliderThumbElement.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/loader/cache/CachedResourceLoader.cpp | 4 | ||||
-rw-r--r-- | Source/WebCore/loader/cache/CachedResourceLoader.h | 6 | ||||
-rw-r--r-- | Source/WebCore/page/EventHandler.cpp | 9 | ||||
-rw-r--r-- | Source/WebCore/page/Settings.cpp | 7 | ||||
-rw-r--r-- | Source/WebCore/page/Settings.h | 7 | ||||
-rw-r--r-- | Source/WebCore/platform/graphics/MediaPlayer.h | 4 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderBox.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderLayer.cpp | 5 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderLayer.h | 4 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderLayerBacking.cpp | 18 |
17 files changed, 86 insertions, 165 deletions
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp index 02733ae..a941600 100644 --- a/Source/WebCore/css/CSSParser.cpp +++ b/Source/WebCore/css/CSSParser.cpp @@ -1893,7 +1893,19 @@ bool CSSParser::parseValue(int propId, bool important) case CSSPropertyWebkitTextEmphasisStyle: return parseTextEmphasisStyle(important); -<<<<<<< HEAD + case CSSPropertyWebkitTextOrientation: + // FIXME: For now just support upright and vertical-right. + if (id == CSSValueVerticalRight || id == CSSValueUpright) + validPrimitive = true; + break; + + case CSSPropertyWebkitLineBoxContain: + if (id == CSSValueNone) + validPrimitive = true; + else + return parseLineBoxContain(important); + break; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: { @@ -1931,20 +1943,6 @@ bool CSSParser::parseValue(int propId, bool important) m_valueList->next(); break; #endif -======= - case CSSPropertyWebkitTextOrientation: - // FIXME: For now just support upright and vertical-right. - if (id == CSSValueVerticalRight || id == CSSValueUpright) - validPrimitive = true; - break; - - case CSSPropertyWebkitLineBoxContain: - if (id == CSSValueNone) - validPrimitive = true; - else - return parseLineBoxContain(important); - break; ->>>>>>> webkit.org at r82507 #if ENABLE(SVG) default: diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index d41e41b..7387089 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -6159,7 +6159,57 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; -<<<<<<< HEAD + case CSSPropertyWebkitTextOrientation: { + if (!isInherit && !isInitial && !primitiveValue) + return; + + TextOrientation result; + if (isInherit) + result = m_parentStyle->fontDescription().textOrientation(); + else if (isInitial) + result = RenderStyle::initialTextOrientation(); + else + result = *primitiveValue; + + FontDescription fontDescription = m_style->fontDescription(); + if (fontDescription.textOrientation() != result) { + fontDescription.setTextOrientation(result); + if (m_style->setFontDescription(fontDescription)) + m_fontDirty = true; + } + return; + } + + case CSSPropertyWebkitLineBoxContain: { + HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain) + if (primitiveValue && primitiveValue->getIdent() == CSSValueNone) { + m_style->setLineBoxContain(LineBoxContainNone); + return; + } + + if (!value->isCSSLineBoxContainValue()) + return; + + CSSLineBoxContainValue* lineBoxContainValue = static_cast<CSSLineBoxContainValue*>(value); + m_style->setLineBoxContain(lineBoxContainValue->value()); + return; + } + + // These properties are implemented in the CSSStyleApplyProperty lookup table. + case CSSPropertyColor: + case CSSPropertyBackgroundColor: + case CSSPropertyBorderBottomColor: + case CSSPropertyBorderLeftColor: + case CSSPropertyBorderRightColor: + case CSSPropertyBorderTopColor: + case CSSPropertyOutlineColor: + case CSSPropertyWebkitColumnRuleColor: + case CSSPropertyWebkitTextEmphasisColor: + case CSSPropertyWebkitTextFillColor: + case CSSPropertyWebkitTextStrokeColor: + ASSERT_NOT_REACHED(); + return; + #ifdef ANDROID_CSS_RING case CSSPropertyWebkitRing: if (valueType != CSSValue::CSS_INHERIT || !m_parentNode) return; @@ -6303,58 +6353,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value) return; } #endif -======= - case CSSPropertyWebkitTextOrientation: { - if (!isInherit && !isInitial && !primitiveValue) - return; - - TextOrientation result; - if (isInherit) - result = m_parentStyle->fontDescription().textOrientation(); - else if (isInitial) - result = RenderStyle::initialTextOrientation(); - else - result = *primitiveValue; - - FontDescription fontDescription = m_style->fontDescription(); - if (fontDescription.textOrientation() != result) { - fontDescription.setTextOrientation(result); - if (m_style->setFontDescription(fontDescription)) - m_fontDirty = true; - } - return; - } - - case CSSPropertyWebkitLineBoxContain: { - HANDLE_INHERIT_AND_INITIAL(lineBoxContain, LineBoxContain) - if (primitiveValue && primitiveValue->getIdent() == CSSValueNone) { - m_style->setLineBoxContain(LineBoxContainNone); - return; - } - - if (!value->isCSSLineBoxContainValue()) - return; - - CSSLineBoxContainValue* lineBoxContainValue = static_cast<CSSLineBoxContainValue*>(value); - m_style->setLineBoxContain(lineBoxContainValue->value()); - return; - } - - // These properties are implemented in the CSSStyleApplyProperty lookup table. - case CSSPropertyColor: - case CSSPropertyBackgroundColor: - case CSSPropertyBorderBottomColor: - case CSSPropertyBorderLeftColor: - case CSSPropertyBorderRightColor: - case CSSPropertyBorderTopColor: - case CSSPropertyOutlineColor: - case CSSPropertyWebkitColumnRuleColor: - case CSSPropertyWebkitTextEmphasisColor: - case CSSPropertyWebkitTextFillColor: - case CSSPropertyWebkitTextStrokeColor: - ASSERT_NOT_REACHED(); - return; ->>>>>>> webkit.org at r82507 #if ENABLE(SVG) default: diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 233b798..a0ddede 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -394,14 +394,10 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML) : ContainerNode(0) , m_compatibilityMode(NoQuirksMode) , m_compatibilityModeLocked(false) -<<<<<<< HEAD - , m_domTreeVersion(0) + , m_domTreeVersion(++s_globalTreeVersion) #ifdef ANDROID_STYLE_VERSION , m_styleVersion(0) #endif -======= - , m_domTreeVersion(++s_globalTreeVersion) ->>>>>>> webkit.org at r82507 , m_styleSheets(StyleSheetList::create(this)) , m_readyState(Complete) , m_styleRecalcTimer(this, &Document::styleRecalcTimerFired) diff --git a/Source/WebCore/dom/Document.h b/Source/WebCore/dom/Document.h index c9a1b55..11c595a 100644 --- a/Source/WebCore/dom/Document.h +++ b/Source/WebCore/dom/Document.h @@ -1253,15 +1253,11 @@ private: RefPtr<Node> m_activeNode; mutable RefPtr<Element> m_documentElement; -<<<<<<< HEAD - unsigned m_domTreeVersion; + uint64_t m_domTreeVersion; + static uint64_t s_globalTreeVersion; #ifdef ANDROID_STYLE_VERSION unsigned m_styleVersion; #endif -======= - uint64_t m_domTreeVersion; - static uint64_t s_globalTreeVersion; ->>>>>>> webkit.org at r82507 HashSet<NodeIterator*> m_nodeIterators; HashSet<Range*> m_ranges; diff --git a/Source/WebCore/dom/StyleElement.cpp b/Source/WebCore/dom/StyleElement.cpp index e9d035d..9892ed7 100644 --- a/Source/WebCore/dom/StyleElement.cpp +++ b/Source/WebCore/dom/StyleElement.cpp @@ -103,15 +103,10 @@ void StyleElement::process(Element* e) for (Node* c = e->firstChild(); c; c = c->nextSibling()) { if (isValidStyleChild(c)) { unsigned length = c->nodeValue().length(); -<<<<<<< HEAD - if (length > std::numeric_limits<unsigned>::max() - resultLength) - CRASH(); -======= if (length > std::numeric_limits<unsigned>::max() - resultLength) { createSheet(e, m_startLineNumber, ""); return; } ->>>>>>> webkit.org at r82507 resultLength += length; } } diff --git a/Source/WebCore/html/shadow/MediaControls.cpp b/Source/WebCore/html/shadow/MediaControls.cpp index 20f1abb..04bdce4 100644 --- a/Source/WebCore/html/shadow/MediaControls.cpp +++ b/Source/WebCore/html/shadow/MediaControls.cpp @@ -557,24 +557,6 @@ void MediaControls::forwardEvent(Event* event) #endif } -<<<<<<< HEAD -// We want the timeline slider to be at least 100 pixels wide. -static const int minWidthToDisplayTimeDisplays = 16 + 16 + 45 + 100 + 45 + 16 + 1; - -void MediaControls::updateTimeDisplayVisibility() -{ - ASSERT(m_mediaElement->renderer()); - - if (!m_currentTimeDisplay && !m_timeRemainingDisplay) - return; - - int width = m_mediaElement->renderBox()->width(); - bool shouldShowTimeDisplays = width >= minWidthToDisplayTimeDisplays * m_mediaElement->renderer()->style()->effectiveZoom(); - - m_currentTimeDisplay->setVisible(shouldShowTimeDisplays); - m_timeRemainingDisplay->setVisible(shouldShowTimeDisplays); -} - #if PLATFORM(ANDROID) void MediaControls::updateLastTouch() { @@ -582,8 +564,6 @@ void MediaControls::updateLastTouch() } #endif -======= ->>>>>>> webkit.org at r82507 } #endif diff --git a/Source/WebCore/html/shadow/SliderThumbElement.cpp b/Source/WebCore/html/shadow/SliderThumbElement.cpp index d1aa15e..6a6e901 100644 --- a/Source/WebCore/html/shadow/SliderThumbElement.cpp +++ b/Source/WebCore/html/shadow/SliderThumbElement.cpp @@ -224,13 +224,12 @@ void SliderThumbElement::defaultEventHandler(Event* event) #endif ) { if (m_inDragMode) -<<<<<<< HEAD #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) { if (event->isMouseEvent()) { MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); #endif - setPosition(mouseEvent->absoluteLocation()); + setPositionFromPoint(mouseEvent->absoluteLocation()); #if PLATFORM(ANDROID) && ENABLE(TOUCH_EVENTS) } else if (event->isTouchEvent()) { TouchEvent* touchEvent = static_cast<TouchEvent*>(event); @@ -238,7 +237,7 @@ void SliderThumbElement::defaultEventHandler(Event* event) IntPoint curPoint; curPoint.setX(touchEvent->touches()->item(0)->pageX()); curPoint.setY(touchEvent->touches()->item(0)->pageY()); - setPosition(curPoint); + setPositionFromPoint(curPoint); // Tell the webview that webkit will handle the following move events event->setDefaultPrevented(true); } @@ -246,9 +245,6 @@ void SliderThumbElement::defaultEventHandler(Event* event) } #endif -======= - setPositionFromPoint(mouseEvent->absoluteLocation()); ->>>>>>> webkit.org at r82507 return; } diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp index 3b6a0b2..9103eff 100644 --- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp +++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp @@ -85,13 +85,9 @@ CachedResourceLoader::CachedResourceLoader(Document* document) , m_autoLoadImages(true) , m_loadFinishing(false) , m_allowStaleResources(false) -<<<<<<< HEAD #ifdef ANDROID_BLOCK_NETWORK_IMAGE , m_blockNetworkImage(false) #endif - , m_isInMethod(0) -======= ->>>>>>> webkit.org at r82507 { } diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h index a68ebd3..881ad2f 100644 --- a/Source/WebCore/loader/cache/CachedResourceLoader.h +++ b/Source/WebCore/loader/cache/CachedResourceLoader.h @@ -153,15 +153,9 @@ private: bool m_autoLoadImages : 1; bool m_loadFinishing : 1; bool m_allowStaleResources : 1; -<<<<<<< HEAD #ifdef ANDROID_BLOCK_NETWORK_IMAGE bool m_blockNetworkImage : 1; #endif - - // FIME: For debugging, remove. - unsigned m_isInMethod; -======= ->>>>>>> webkit.org at r82507 }; } diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp index f05e8b2..de59083 100644 --- a/Source/WebCore/page/EventHandler.cpp +++ b/Source/WebCore/page/EventHandler.cpp @@ -98,13 +98,12 @@ #include "TouchEvent.h" #endif -<<<<<<< HEAD -#if defined(ANDROID_PLUGINS) -#include "WebViewCore.h" -======= #if ENABLE(GESTURE_RECOGNIZER) #include "PlatformGestureRecognizer.h" ->>>>>>> webkit.org at r82507 +#endif + +#if defined(ANDROID_PLUGINS) +#include "WebViewCore.h" #endif namespace WebCore { diff --git a/Source/WebCore/page/Settings.cpp b/Source/WebCore/page/Settings.cpp index eb8c903..5cf20d6 100644 --- a/Source/WebCore/page/Settings.cpp +++ b/Source/WebCore/page/Settings.cpp @@ -173,7 +173,8 @@ Settings::Settings(Page* page) , m_usePreHTML5ParserQuirks(false) , m_hyperlinkAuditingEnabled(false) , m_crossOriginCheckInGetMatchedCSSRulesDisabled(false) -<<<<<<< HEAD + , m_useQuickLookResourceCachingQuirks(false) + , m_forceCompositingMode(false) #ifdef ANDROID_LAYOUT , m_useWideViewport(false) #endif @@ -189,10 +190,6 @@ Settings::Settings(Page* page) #ifdef ANDROID_PLUGINS , m_pluginsOnDemand(false) #endif -======= - , m_useQuickLookResourceCachingQuirks(false) - , m_forceCompositingMode(false) ->>>>>>> webkit.org at r82507 { // A Frame may not have been created yet, so we initialize the AtomicString // hash before trying to use it. diff --git a/Source/WebCore/page/Settings.h b/Source/WebCore/page/Settings.h index e8e791a..35446c5 100644 --- a/Source/WebCore/page/Settings.h +++ b/Source/WebCore/page/Settings.h @@ -575,7 +575,8 @@ namespace WebCore { bool m_usePreHTML5ParserQuirks: 1; bool m_hyperlinkAuditingEnabled : 1; bool m_crossOriginCheckInGetMatchedCSSRulesDisabled : 1; -<<<<<<< HEAD + bool m_useQuickLookResourceCachingQuirks : 1; + bool m_forceCompositingMode : 1; #ifdef ANDROID_META_SUPPORT // default is yes bool m_viewport_user_scalable : 1; @@ -605,10 +606,6 @@ namespace WebCore { #ifdef ANDROID_PLUGINS bool m_pluginsOnDemand : 1; #endif -======= - bool m_useQuickLookResourceCachingQuirks : 1; - bool m_forceCompositingMode : 1; ->>>>>>> webkit.org at r82507 #if USE(SAFARI_THEME) static bool gShouldPaintNativeControls; diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h index 5872c88..ff304ea 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.h +++ b/Source/WebCore/platform/graphics/MediaPlayer.h @@ -182,16 +182,12 @@ public: IntSize naturalSize(); bool hasVideo() const; bool hasAudio() const; -<<<<<<< HEAD #if PLATFORM(ANDROID) enum MediaElementType { Video, Audio }; void setMediaElementType(MediaElementType type) { m_mediaElementType = type; } MediaElementType mediaElementType() { return m_mediaElementType; } #endif - -======= ->>>>>>> webkit.org at r82507 void setFrameView(FrameView* frameView) { m_frameView = frameView; } FrameView* frameView() { return m_frameView; } bool inMediaDocument(); diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp index 28334dd..7b32f07 100644 --- a/Source/WebCore/rendering/RenderBox.cpp +++ b/Source/WebCore/rendering/RenderBox.cpp @@ -2126,7 +2126,6 @@ void RenderBox::computeBlockDirectionMargins(RenderBlock* containingBlock) int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const { -<<<<<<< HEAD #if PLATFORM(ANDROID) // Fixed element's position should be decided by the visible screen size. // That is in the doc coordindate. @@ -2136,10 +2135,7 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje } #endif - if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode()) -======= if (checkForPerpendicularWritingMode && containingBlock->isHorizontalWritingMode() != isHorizontalWritingMode()) ->>>>>>> webkit.org at r82507 return containingBlockLogicalHeightForPositioned(containingBlock, false); if (containingBlock->isBox()) @@ -2170,7 +2166,6 @@ int RenderBox::containingBlockLogicalWidthForPositioned(const RenderBoxModelObje int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObject* containingBlock, bool checkForPerpendicularWritingMode) const { -<<<<<<< HEAD #if PLATFORM(ANDROID) // Fixed element's position should be decided by the visible screen size. // That is in the doc coordindate. @@ -2180,10 +2175,7 @@ int RenderBox::containingBlockLogicalHeightForPositioned(const RenderBoxModelObj } #endif - if (checkForPerpendicularWritingMode && containingBlock->style()->isHorizontalWritingMode() != style()->isHorizontalWritingMode()) -======= if (checkForPerpendicularWritingMode && containingBlock->isHorizontalWritingMode() != isHorizontalWritingMode()) ->>>>>>> webkit.org at r82507 return containingBlockLogicalWidthForPositioned(containingBlock, false); if (containingBlock->isBox()) diff --git a/Source/WebCore/rendering/RenderLayer.cpp b/Source/WebCore/rendering/RenderLayer.cpp index 1c60500..3c6bc31 100644 --- a/Source/WebCore/rendering/RenderLayer.cpp +++ b/Source/WebCore/rendering/RenderLayer.cpp @@ -178,13 +178,10 @@ RenderLayer::RenderLayer(RenderBoxModelObject* renderer) , m_hasCompositingDescendant(false) , m_mustOverlapCompositedLayers(false) #endif -<<<<<<< HEAD + , m_containsDirtyOverlayScrollbars(false) #if ENABLE(ANDROID_OVERFLOW_SCROLL) , m_hasOverflowScroll(false) #endif -======= - , m_containsDirtyOverlayScrollbars(false) ->>>>>>> webkit.org at r82507 , m_marquee(0) , m_staticInlinePosition(0) , m_staticBlockPosition(0) diff --git a/Source/WebCore/rendering/RenderLayer.h b/Source/WebCore/rendering/RenderLayer.h index d2d41df..17ba99e 100644 --- a/Source/WebCore/rendering/RenderLayer.h +++ b/Source/WebCore/rendering/RenderLayer.h @@ -733,12 +733,12 @@ protected: bool m_hasCompositingDescendant : 1; bool m_mustOverlapCompositedLayers : 1; #endif + + bool m_containsDirtyOverlayScrollbars : 1; #if ENABLE(ANDROID_OVERFLOW_SCROLL) bool m_hasOverflowScroll : 1; #endif - bool m_containsDirtyOverlayScrollbars : 1; - IntPoint m_cachedOverlayScrollbarOffset; RenderMarquee* m_marquee; // Used by layers with overflow:marquee diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp index ec3b6fd..26a10dd 100644 --- a/Source/WebCore/rendering/RenderLayerBacking.cpp +++ b/Source/WebCore/rendering/RenderLayerBacking.cpp @@ -1115,26 +1115,20 @@ void RenderLayerBacking::paintContents(const GraphicsLayer* graphicsLayer, Graph { InspectorInstrumentationCookie cookie = InspectorInstrumentation::willPaint(m_owningLayer->renderer()->frame(), clip); -<<<<<<< HEAD - // We have to use the same root as for hit testing, because both methods - // can compute and cache clipRects. - IntRect enclosingBBox = compositedBounds(); -#if ENABLE(ANDROID_OVERFLOW_SCROLL) - // If we encounter a scrollable layer, layers inside the scrollable layer - // will need their entire content recorded. - if (m_owningLayer->hasOverflowParent()) - enclosingBBox.setSize(clip.size()); -#endif -======= IntSize offset = graphicsLayer->offsetFromRenderer(); context.translate(-offset); ->>>>>>> webkit.org at r82507 IntRect clipRect(clip); clipRect.move(offset); // The dirtyRect is in the coords of the painting root. IntRect dirtyRect = compositedBounds(); +#if ENABLE(ANDROID_OVERFLOW_SCROLL) + // If we encounter a scrollable layer, layers inside the scrollable layer + // will need their entire content recorded. + if (m_owningLayer->hasOverflowParent()) + dirtyRect.setSize(clip.size()); +#endif dirtyRect.intersect(clipRect); // We have to use the same root as for hit testing, because both methods can compute and cache clipRects. |