summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/bridge/npapi.h8
-rw-r--r--WebCore/css/CSSParser.cpp6
-rw-r--r--WebCore/dom/Node.cpp3
-rw-r--r--WebCore/page/ChromeClient.h6
-rw-r--r--WebCore/page/Settings.cpp5
-rw-r--r--WebCore/page/Settings.h13
-rw-r--r--WebCore/platform/PlatformTouchEvent.h3
-rw-r--r--WebCore/platform/PlatformTouchPoint.h3
-rw-r--r--WebCore/platform/Widget.cpp13
-rw-r--r--WebCore/platform/android/PlatformTouchEventAndroid.cpp4
-rw-r--r--WebCore/rendering/RenderBox.cpp46
-rw-r--r--WebCore/rendering/RenderBox.h6
-rw-r--r--WebCore/rendering/RenderIFrame.cpp13
-rw-r--r--WebCore/rendering/RenderTable.cpp4
-rw-r--r--WebCore/rendering/RenderView.cpp8
15 files changed, 23 insertions, 118 deletions
diff --git a/WebCore/bridge/npapi.h b/WebCore/bridge/npapi.h
index b1e8fcd..6b8556d 100644
--- a/WebCore/bridge/npapi.h
+++ b/WebCore/bridge/npapi.h
@@ -381,7 +381,6 @@ typedef enum {
, NPPVpluginCoreAnimationLayer = 1003
#endif
-<<<<<<< HEAD
#ifdef ANDROID
/* Used when the plugin returns 0 from NPN_WriteReady and wishes the browser
* to wait a certain amount of millis before calling NPN_WriteReady again.
@@ -392,10 +391,7 @@ typedef enum {
, NPPFakeValueToForce32Bits = 0x7FFFFFFF
#endif
-#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
-=======
#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
->>>>>>> webkit.org at r68651
, NPPVpluginWindowlessLocalBool = 2002
#endif
} NPPVariable;
@@ -441,16 +437,12 @@ typedef enum {
#endif
, NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
#endif /* XP_MACOSX */
-<<<<<<< HEAD
#ifdef ANDROID
, NPNFakeValueToForce32Bits = 0x7FFFFFFF
#endif
-#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO == 5)
-=======
#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
->>>>>>> webkit.org at r68651
, NPNVSupportsWindowlessLocal = 2002
#endif
} NPNVariable;
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index 5f3fb7d..0347d69 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -90,16 +90,10 @@ extern int cssyyparse(void* parser);
using namespace std;
using namespace WTF;
-<<<<<<< HEAD
-#include "CSSPropertyNames.cpp"
-#include "CSSValueKeywords.cpp"
-
#ifdef ANDROID_INSTRUMENT
#include "TimeCounter.h"
#endif
-=======
->>>>>>> webkit.org at r68651
namespace WebCore {
static const unsigned INVALID_NUM_PARSED_PROPERTIES = UINT_MAX;
diff --git a/WebCore/dom/Node.cpp b/WebCore/dom/Node.cpp
index 5694dfe..831250e 100644
--- a/WebCore/dom/Node.cpp
+++ b/WebCore/dom/Node.cpp
@@ -25,15 +25,12 @@
#include "config.h"
#include "Node.h"
-<<<<<<< HEAD
#ifdef ANDROID_DOM_LOGGING
#define LOG_TAG "webcore"
#include "AndroidLog.h"
#endif
-=======
#include "AXObjectCache.h"
->>>>>>> webkit.org at r68651
#include "Attr.h"
#include "Attribute.h"
#include "CSSParser.h"
diff --git a/WebCore/page/ChromeClient.h b/WebCore/page/ChromeClient.h
index c6555b9..bf6c157 100644
--- a/WebCore/page/ChromeClient.h
+++ b/WebCore/page/ChromeClient.h
@@ -270,13 +270,11 @@ namespace WebCore {
virtual PassRefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const = 0;
virtual PassRefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const = 0;
-<<<<<<< HEAD
+ virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
+
#if ENABLE(ANDROID_INSTALLABLE_WEB_APPS)
virtual void webAppCanBeInstalled() = 0;
#endif
-=======
- virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { }
->>>>>>> webkit.org at r68651
protected:
virtual ~ChromeClient() { }
diff --git a/WebCore/page/Settings.cpp b/WebCore/page/Settings.cpp
index 2e67bf1..8e8d43b 100644
--- a/WebCore/page/Settings.cpp
+++ b/WebCore/page/Settings.cpp
@@ -159,16 +159,13 @@ Settings::Settings(Page* page)
, m_memoryInfoEnabled(false)
, m_interactiveFormValidation(false)
, m_usePreHTML5ParserQuirks(false)
-<<<<<<< HEAD
+ , m_hyperlinkAuditingEnabled(false)
#if ENABLE(WEB_AUTOFILL)
, m_autoFillEnabled(false)
#endif
#ifdef ANDROID_PLUGINS
, m_pluginsOnDemand(false)
#endif
-=======
- , m_hyperlinkAuditingEnabled(false)
->>>>>>> webkit.org at r68651
{
// 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 7a65eaa..3401428 100644
--- a/WebCore/page/Settings.h
+++ b/WebCore/page/Settings.h
@@ -395,15 +395,13 @@ namespace WebCore {
void setUsePreHTML5ParserQuirks(bool flag) { m_usePreHTML5ParserQuirks = flag; }
bool usePreHTML5ParserQuirks() const { return m_usePreHTML5ParserQuirks; }
-<<<<<<< HEAD
+ void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
+ bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
+
#if ENABLE(WEB_AUTOFILL)
void setAutoFillEnabled(bool flag) { m_autoFillEnabled = flag; }
bool autoFillEnabled() { return m_autoFillEnabled; }
#endif
-=======
- void setHyperlinkAuditingEnabled(bool flag) { m_hyperlinkAuditingEnabled = flag; }
- bool hyperlinkAuditingEnabled() const { return m_hyperlinkAuditingEnabled; }
->>>>>>> webkit.org at r68651
private:
Page* m_page;
@@ -529,16 +527,13 @@ namespace WebCore {
bool m_memoryInfoEnabled: 1;
bool m_interactiveFormValidation: 1;
bool m_usePreHTML5ParserQuirks: 1;
-<<<<<<< HEAD
+ bool m_hyperlinkAuditingEnabled : 1;
#ifdef ANDROID_PLUGINS
bool m_pluginsOnDemand : 1;
#endif
#if ENABLE(WEB_AUTOFILL)
bool m_autoFillEnabled: 1;
#endif
-=======
- bool m_hyperlinkAuditingEnabled : 1;
->>>>>>> webkit.org at r68651
#if USE(SAFARI_THEME)
static bool gShouldPaintNativeControls;
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h
index f8d503d..84ed910 100644
--- a/WebCore/platform/PlatformTouchEvent.h
+++ b/WebCore/platform/PlatformTouchEvent.h
@@ -67,11 +67,8 @@ public:
PlatformTouchEvent(QTouchEvent*);
#elif PLATFORM(ANDROID)
PlatformTouchEvent(const Vector<IntPoint>&, TouchEventType, PlatformTouchPoint::State, int metaState);
-<<<<<<< HEAD
-=======
#elif PLATFORM(BREWMP)
PlatformTouchEvent(AEEEvent, uint16 wParam, uint32 dwParam);
->>>>>>> webkit.org at r68651
#endif
TouchEventType type() const { return m_type; }
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h
index f330eb6..82c8d78 100644
--- a/WebCore/platform/PlatformTouchPoint.h
+++ b/WebCore/platform/PlatformTouchPoint.h
@@ -48,11 +48,8 @@ public:
PlatformTouchPoint() {};
#elif PLATFORM(ANDROID)
PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State);
-<<<<<<< HEAD
-=======
#elif PLATFORM(BREWMP)
PlatformTouchPoint(int id, const IntPoint& windowPos, State);
->>>>>>> webkit.org at r68651
#endif
unsigned id() const { return m_id; }
diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp
index 05a5237..77560ff 100644
--- a/WebCore/platform/Widget.cpp
+++ b/WebCore/platform/Widget.cpp
@@ -127,19 +127,6 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint
}
#endif
-<<<<<<< HEAD
-#if !PLATFORM(MAC) && !PLATFORM(GTK) && !OS(ANDROID)
-void Widget::releasePlatformWidget()
-{
-}
-
-void Widget::retainPlatformWidget()
-{
-}
-#endif
-
-=======
->>>>>>> webkit.org at r68651
IntRect Widget::convertToContainingView(const IntRect& localRect) const
{
if (const ScrollView* parentScrollView = parent()) {
diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
index eb23322..8b3d285 100644
--- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp
+++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp
@@ -43,11 +43,7 @@ PlatformTouchEvent::PlatformTouchEvent(const Vector<IntPoint>& windowPoints, Tou
{
m_touchPoints.reserveCapacity(windowPoints.size());
for (unsigned c = 0; c < windowPoints.size(); c++)
-<<<<<<< HEAD
m_touchPoints.append(PlatformTouchPoint(c, windowPoints[c], state));
-=======
- m_touchPoints.append(PlatformTouchPoint(windowPos, state));
->>>>>>> webkit.org at r68651
m_altKey = metaState & META_ALT_ON;
m_shiftKey = metaState & META_SHIFT_ON;
diff --git a/WebCore/rendering/RenderBox.cpp b/WebCore/rendering/RenderBox.cpp
index 553be53..c8d9a24 100644
--- a/WebCore/rendering/RenderBox.cpp
+++ b/WebCore/rendering/RenderBox.cpp
@@ -1452,7 +1452,6 @@ void RenderBox::repaintDuringLayoutIfMoved(const IntRect& rect)
}
}
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
void RenderBox::setVisibleWidth(int newWidth) {
const Settings* settings = document()->settings();
@@ -1474,10 +1473,7 @@ bool RenderBox::checkAndSetRelayoutChildren(bool* relayoutChildren) {
}
#endif
-void RenderBox::calcWidth()
-=======
void RenderBox::computeLogicalWidth()
->>>>>>> webkit.org at r68651
{
#ifdef ANDROID_LAYOUT
if (view()->frameView())
@@ -1522,15 +1518,14 @@ void RenderBox::computeLogicalWidth()
if (isInline() && !isInlineBlockOrInlineTable()) {
// just calculate margins
-<<<<<<< HEAD
- m_marginLeft = marginLeft.calcMinValue(containerWidth);
- m_marginRight = marginRight.calcMinValue(containerWidth);
+ setMarginStart(style()->marginStart().calcMinValue(containerLogicalWidth));
+ setMarginEnd(style()->marginEnd().calcMinValue(containerLogicalWidth));
#ifdef ANDROID_LAYOUT
if (treatAsReplaced) {
#else
if (treatAsReplaced)
#endif
- setWidth(max(w.value() + borderAndPaddingWidth(), minPrefWidth()));
+ setLogicalWidth(max(logicalWidthLength.value() + borderAndPaddingLogicalWidth(), minPreferredLogicalWidth()));
#ifdef ANDROID_LAYOUT
// in SSR mode with replaced box, if the box width is wider than the container width,
@@ -1543,12 +1538,6 @@ void RenderBox::computeLogicalWidth()
}
}
#endif
-=======
- setMarginStart(style()->marginStart().calcMinValue(containerLogicalWidth));
- setMarginEnd(style()->marginEnd().calcMinValue(containerLogicalWidth));
- if (treatAsReplaced)
- setLogicalWidth(max(logicalWidthLength.value() + borderAndPaddingLogicalWidth(), minPreferredLogicalWidth()));
->>>>>>> webkit.org at r68651
return;
}
@@ -1582,16 +1571,13 @@ void RenderBox::computeLogicalWidth()
logicalWidthLength = Length(logicalWidth(), Fixed);
}
-<<<<<<< HEAD
- // Margin calculations
- if (w.isAuto()) {
- m_marginLeft = marginLeft.calcMinValue(containerWidth);
- m_marginRight = marginRight.calcMinValue(containerWidth);
- } else {
- m_marginLeft = 0;
- m_marginRight = 0;
- calcHorizontalMargins(marginLeft, marginRight, containerWidth);
- }
+ // Margin calculations.
+ if (logicalWidthLength.isAuto() || hasPerpendicularContainingBlock || isFloating() || isInline()) {
+ setMarginStart(style()->marginStart().calcMinValue(containerLogicalWidth));
+ setMarginEnd(style()->marginEnd().calcMinValue(containerLogicalWidth));
+ } else
+ computeInlineDirectionMargins(cb, containerLogicalWidth, logicalWidth());
+
#ifdef ANDROID_LAYOUT
// in SSR mode with non-replaced box, we use ANDROID_SSR_MARGIN_PADDING for left/right margin.
// If the box width is wider than the container width, it will be shrinked to fit to the container.
@@ -1607,14 +1593,6 @@ void RenderBox::computeLogicalWidth()
setWidth(width() -(m_marginLeft + m_marginRight));
}
#endif
-=======
- // Margin calculations.
- if (logicalWidthLength.isAuto() || hasPerpendicularContainingBlock || isFloating() || isInline()) {
- setMarginStart(style()->marginStart().calcMinValue(containerLogicalWidth));
- setMarginEnd(style()->marginEnd().calcMinValue(containerLogicalWidth));
- } else
- computeInlineDirectionMargins(cb, containerLogicalWidth, logicalWidth());
->>>>>>> webkit.org at r68651
if (!hasPerpendicularContainingBlock && containerLogicalWidth && containerLogicalWidth != (logicalWidth() + marginStart() + marginEnd())
&& !isFloating() && !isInline() && !cb->isFlexibleBox())
@@ -1784,17 +1762,13 @@ void RenderBox::computeLogicalHeight()
int heightResult;
if (checkMinMaxHeight) {
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
// in SSR mode, ignore CSS height as layout is so different
if (document()->settings()->layoutAlgorithm() == Settings::kLayoutSSR)
heightResult = -1;
else
#endif
- heightResult = calcHeightUsing(style()->height());
-=======
heightResult = computeLogicalHeightUsing(style()->logicalHeight());
->>>>>>> webkit.org at r68651
if (heightResult == -1)
heightResult = logicalHeight();
int minH = computeLogicalHeightUsing(style()->logicalMinHeight()); // Leave as -1 if unset.
diff --git a/WebCore/rendering/RenderBox.h b/WebCore/rendering/RenderBox.h
index 445c7bb..1b70fad 100644
--- a/WebCore/rendering/RenderBox.h
+++ b/WebCore/rendering/RenderBox.h
@@ -369,13 +369,11 @@ public:
virtual void markDescendantBlocksAndLinesForLayout(bool inLayout = true);
-<<<<<<< HEAD
+ bool isBlockFlowRoot() const { return !parent() || parent()->style()->blockFlow() != style()->blockFlow(); }
+
#ifdef ANDROID_LAYOUT
int getVisibleWidth() const { return m_visibleWidth; }
#endif
-=======
- bool isBlockFlowRoot() const { return !parent() || parent()->style()->blockFlow() != style()->blockFlow(); }
->>>>>>> webkit.org at r68651
protected:
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
diff --git a/WebCore/rendering/RenderIFrame.cpp b/WebCore/rendering/RenderIFrame.cpp
index cbe4c70..4ed8077 100644
--- a/WebCore/rendering/RenderIFrame.cpp
+++ b/WebCore/rendering/RenderIFrame.cpp
@@ -43,8 +43,7 @@ RenderIFrame::RenderIFrame(Element* element)
void RenderIFrame::computeLogicalHeight()
{
-<<<<<<< HEAD
- RenderPart::calcHeight();
+ RenderPart::computeLogicalHeight();
#ifdef ANDROID_FLATTEN_IFRAME
if (!node()->hasTagName(iframeTag) || !widget() || !widget()->isFrameView())
return;
@@ -69,9 +68,6 @@ void RenderIFrame::computeLogicalHeight()
updateWidgetPosition();
return;
#endif
-=======
- RenderPart::computeLogicalHeight();
->>>>>>> webkit.org at r68651
if (!flattenFrame())
return;
@@ -89,8 +85,7 @@ void RenderIFrame::computeLogicalHeight()
void RenderIFrame::computeLogicalWidth()
{
-<<<<<<< HEAD
- RenderPart::calcWidth();
+ RenderPart::computeLogicalWidth();
#ifdef ANDROID_FLATTEN_IFRAME
if (!node()->hasTagName(iframeTag) || !widget() || !widget()->isFrameView())
return;
@@ -122,9 +117,7 @@ void RenderIFrame::computeLogicalWidth()
updateWidgetPosition();
return;
#endif
-=======
- RenderPart::computeLogicalWidth();
->>>>>>> webkit.org at r68651
+
if (!flattenFrame())
return;
diff --git a/WebCore/rendering/RenderTable.cpp b/WebCore/rendering/RenderTable.cpp
index c2835d6..14723c3 100644
--- a/WebCore/rendering/RenderTable.cpp
+++ b/WebCore/rendering/RenderTable.cpp
@@ -242,16 +242,12 @@ void RenderTable::computeLogicalWidth()
// Finally, with our true width determined, compute our margins for real.
m_marginRight = 0;
m_marginLeft = 0;
-<<<<<<< HEAD
#ifdef ANDROID_LAYOUT
// in SSR mode, we ignore left/right margin for table
if (document()->settings()->layoutAlgorithm() == Settings::kLayoutSSR)
return;
#endif
- calcHorizontalMargins(style()->marginLeft(), style()->marginRight(), availableWidth);
-=======
computeInlineDirectionMargins(cb, availableWidth, width());
->>>>>>> webkit.org at r68651
}
void RenderTable::layout()
diff --git a/WebCore/rendering/RenderView.cpp b/WebCore/rendering/RenderView.cpp
index 439ed76..d9cd152 100644
--- a/WebCore/rendering/RenderView.cpp
+++ b/WebCore/rendering/RenderView.cpp
@@ -85,8 +85,7 @@ void RenderView::computeLogicalHeight()
void RenderView::computeLogicalWidth()
{
if (!printing() && m_frameView)
-<<<<<<< HEAD
- setWidth(viewWidth());
+ setLogicalWidth(viewLogicalWidth());
#ifdef ANDROID_LAYOUT
setVisibleWidth(m_frameView->textWrapWidth());
const Settings * settings = document()->settings();
@@ -94,11 +93,6 @@ void RenderView::computeLogicalWidth()
if (settings->useWideViewport() && settings->viewportWidth() == -1 && width() < minPrefWidth())
setWidth(m_minPrefWidth);
#endif
- m_marginLeft = 0;
- m_marginRight = 0;
-=======
- setLogicalWidth(viewLogicalWidth());
->>>>>>> webkit.org at r68651
}
void RenderView::computePreferredLogicalWidths()
generated by cgit v1.1 at 2025-05-12 20:44:10 +0000