diff options
Diffstat (limited to 'Source')
-rw-r--r-- | Source/WebCore/dom/Document.cpp | 8 | ||||
-rw-r--r-- | Source/WebCore/loader/cache/CachedResourceLoader.cpp | 9 | ||||
-rw-r--r-- | Source/WebCore/loader/cache/CachedResourceLoader.h | 6 | ||||
-rw-r--r-- | Source/WebCore/page/ChromeClient.h | 6 | ||||
-rw-r--r-- | Source/WebCore/page/FrameView.cpp | 4 | ||||
-rw-r--r-- | Source/WebCore/platform/ScrollView.h | 5 | ||||
-rw-r--r-- | Source/WebCore/platform/android/TemporaryLinkStubs.cpp | 10 | ||||
-rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.cpp | 11 | ||||
-rw-r--r-- | Source/WebCore/platform/image-decoders/ImageDecoder.h | 4 | ||||
-rw-r--r-- | Source/WebCore/rendering/InlineTextBox.cpp | 53 | ||||
-rw-r--r-- | Source/WebCore/rendering/RenderBlockLineLayout.cpp | 16 | ||||
-rw-r--r-- | Source/WebKit/android/jni/MIMETypeRegistry.cpp | 1 |
12 files changed, 32 insertions, 101 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index 6b1b90d..ee790ab 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -470,15 +470,7 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML) if ((frame && frame->ownerElement()) || !url.isEmpty()) setURL(url); -<<<<<<< HEAD - // 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; - #if !PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r78450 m_axObjectCache = 0; #endif diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp index 211ab85..10c1b6c 100644 --- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp +++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp @@ -80,16 +80,13 @@ static CachedResource* createResource(CachedResource::Type type, const KURL& url CachedResourceLoader::CachedResourceLoader(Document* document) : m_document(document) , m_requestCount(0) -<<<<<<< HEAD -#ifdef ANDROID_BLOCK_NETWORK_IMAGE - , m_blockNetworkImage(false) -#endif -======= , m_loadDoneActionTimer(this, &CachedResourceLoader::loadDoneActionTimerFired) ->>>>>>> webkit.org at r78450 , m_autoLoadImages(true) , m_loadFinishing(false) , m_allowStaleResources(false) +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + , m_blockNetworkImage(false) +#endif { } diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h index bd2bfec..881ad2f 100644 --- a/Source/WebCore/loader/cache/CachedResourceLoader.h +++ b/Source/WebCore/loader/cache/CachedResourceLoader.h @@ -150,12 +150,12 @@ private: Timer<CachedResourceLoader> m_loadDoneActionTimer; //29 bits left -#ifdef ANDROID_BLOCK_NETWORK_IMAGE - bool m_blockNetworkImage : 1; -#endif bool m_autoLoadImages : 1; bool m_loadFinishing : 1; bool m_allowStaleResources : 1; +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + bool m_blockNetworkImage : 1; +#endif }; } diff --git a/Source/WebCore/page/ChromeClient.h b/Source/WebCore/page/ChromeClient.h index 83f039f..42ef727 100644 --- a/Source/WebCore/page/ChromeClient.h +++ b/Source/WebCore/page/ChromeClient.h @@ -304,13 +304,11 @@ namespace WebCore { virtual void postAccessibilityNotification(AccessibilityObject*, AXObjectCache::AXNotification) { } -<<<<<<< HEAD + virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } + #if ENABLE(ANDROID_INSTALLABLE_WEB_APPS) virtual void webAppCanBeInstalled() = 0; #endif -======= - virtual void didCompleteRubberBandForMainFrame(const IntSize&) const { } ->>>>>>> webkit.org at r78450 protected: virtual ~ChromeClient() { } diff --git a/Source/WebCore/page/FrameView.cpp b/Source/WebCore/page/FrameView.cpp index f8aa068..0dc71f6 100644 --- a/Source/WebCore/page/FrameView.cpp +++ b/Source/WebCore/page/FrameView.cpp @@ -1134,7 +1134,6 @@ void FrameView::removeFixedObject() updateCanBlitOnScrollRecursively(); } -<<<<<<< HEAD #if PLATFORM(ANDROID) // When the screen size change, fixed positioned element should be updated. void FrameView::updatePositionedObjects() @@ -1157,12 +1156,11 @@ void FrameView::updatePositionedObjects() } } #endif -======= + IntPoint FrameView::currentMousePosition() const { return m_frame ? m_frame->eventHandler()->currentMousePosition() : IntPoint(); } ->>>>>>> webkit.org at r78450 bool FrameView::scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) { diff --git a/Source/WebCore/platform/ScrollView.h b/Source/WebCore/platform/ScrollView.h index 2bd1447..7df735a 100644 --- a/Source/WebCore/platform/ScrollView.h +++ b/Source/WebCore/platform/ScrollView.h @@ -162,16 +162,13 @@ public: int contentsWidth() const { return contentsSize().width(); } int contentsHeight() const { return contentsSize().height(); } virtual void setContentsSize(const IntSize&); -<<<<<<< HEAD - + #if PLATFORM(ANDROID) int actualWidth() const; int actualHeight() const; int actualScrollX() const; int actualScrollY() const; #endif -======= ->>>>>>> webkit.org at r78450 // Functions for querying the current scrolled position (both as a point, a size, or as individual X and Y values). IntPoint scrollPosition() const { return visibleContentRect().location(); } diff --git a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp index cf15462..a046775 100644 --- a/Source/WebCore/platform/android/TemporaryLinkStubs.cpp +++ b/Source/WebCore/platform/android/TemporaryLinkStubs.cpp @@ -298,16 +298,6 @@ void* WebCore::Frame::dragImageForSelection() return 0; } -<<<<<<< HEAD -======= - -WTF::String WebCore::MIMETypeRegistry::getMIMETypeForExtension(WTF::String const&) -{ - ASSERT(isMainThread()); - return WTF::String(); -} - ->>>>>>> webkit.org at r78450 void WebCore::Pasteboard::writeImage(WebCore::Node*, WebCore::KURL const&, WTF::String const&) {} namespace WebCore { diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp index 2aae205..840ab98 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.cpp +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.cpp @@ -55,12 +55,6 @@ unsigned copyFromSharedBuffer(char* buffer, unsigned bufferLength, const SharedB return bytesExtracted; } -<<<<<<< HEAD -#if !OS(ANDROID) -// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and -// JPEGDecoder, which aren't used on Android, and which don't all compile. -// TODO: Find a better fix. -======= bool matchesGIFSignature(char* contents) { return !memcmp(contents, "GIF8", 4); @@ -100,7 +94,10 @@ bool matchesCURSignature(char* contents) } ->>>>>>> webkit.org at r78450 +#if !OS(ANDROID) +// This method requires BMPImageDecoder, PNGImageDecoder, ICOImageDecoder and +// JPEGDecoder, which aren't used on Android, and which don't all compile. +// TODO: Find a better fix. ImageDecoder* ImageDecoder::create(const SharedBuffer& data, ImageSource::AlphaOption alphaOption, ImageSource::GammaAndColorProfileOption gammaAndColorProfileOption) { static const unsigned lengthOfLongestSignature = 14; // To wit: "RIFF????WEBPVP" diff --git a/Source/WebCore/platform/image-decoders/ImageDecoder.h b/Source/WebCore/platform/image-decoders/ImageDecoder.h index 7d0d0d4..e07f4f2 100644 --- a/Source/WebCore/platform/image-decoders/ImageDecoder.h +++ b/Source/WebCore/platform/image-decoders/ImageDecoder.h @@ -180,11 +180,7 @@ namespace WebCore { g = static_cast<unsigned>(g * alphaPercent); b = static_cast<unsigned>(b * alphaPercent); } -<<<<<<< HEAD -#if PLATFORM(ANDROID) -======= #if PLATFORM(SKIA) ->>>>>>> webkit.org at r78450 *dest = SkPackARGB32(a, r, g, b); #else *dest = (a << 24 | r << 16 | g << 8 | b); diff --git a/Source/WebCore/rendering/InlineTextBox.cpp b/Source/WebCore/rendering/InlineTextBox.cpp index 9f7e024..37f7eff 100644 --- a/Source/WebCore/rendering/InlineTextBox.cpp +++ b/Source/WebCore/rendering/InlineTextBox.cpp @@ -163,17 +163,13 @@ IntRect InlineTextBox::selectionRect(int tx, int ty, int startPos, int endPos) ePos = len; } -<<<<<<< HEAD #ifdef ANDROID_DISABLE_ROUNDING_HACKS - TextRun textRun = TextRun(characters, len, textObj->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride); + TextRun textRun = TextRun(characters, len, textObj->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); IntRect r = enclosingIntRect(f.selectionRectForText(textRun, IntPoint(), selHeight, sPos, ePos)); #else - IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(characters, len, textObj->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride), -======= IntRect r = enclosingIntRect(f.selectionRectForText(TextRun(characters, len, textObj->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride), ->>>>>>> webkit.org at r78450 IntPoint(), selHeight, sPos, ePos)); #endif @@ -629,15 +625,11 @@ void InlineTextBox::paint(PaintInfo& paintInfo, int tx, int ty) if (hasHyphen()) adjustCharactersAndLengthForHyphen(charactersWithHyphen, styleToUse, characters, length); -<<<<<<< HEAD - TextRun textRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || styleToUse->visuallyOrdered()); + TextRun textRun(characters, length, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || styleToUse->visuallyOrdered()); #ifdef ANDROID_DISABLE_ROUNDING_HACKS if (m_disableRoundingHacks) textRun.disableRoundingHacks(); #endif -======= - TextRun textRun(characters, length, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || styleToUse->visuallyOrdered()); ->>>>>>> webkit.org at r78450 int sPos = 0; int ePos = 0; @@ -791,18 +783,14 @@ void InlineTextBox::paintSelection(GraphicsContext* context, const IntPoint& box int selHeight = selectionHeight(); IntPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY); context->clip(IntRect(localOrigin, IntSize(m_logicalWidth, selHeight))); -<<<<<<< HEAD #ifdef ANDROID_DISABLE_ROUNDING_HACKS - TextRun textRun = TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, + TextRun textRun = TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); context->drawHighlightForText(font, textRun, localOrigin, selHeight, c, style->colorSpace(), sPos, ePos); #else - context->drawHighlightForText(font, TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_toAdd, -======= context->drawHighlightForText(font, TextRun(characters, length, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), ->>>>>>> webkit.org at r78450 !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()), localOrigin, selHeight, c, style->colorSpace(), sPos, ePos); #endif @@ -827,18 +815,14 @@ void InlineTextBox::paintCompositionBackground(GraphicsContext* context, const I int deltaY = renderer()->style()->isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop(); int selHeight = selectionHeight(); IntPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY); -<<<<<<< HEAD #ifdef ANDROID_DISABLE_ROUNDING_HACKS - TextRun textRun = TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, + TextRun textRun = TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); context->drawHighlightForText(font, textRun, localOrigin, selHeight, c, style->colorSpace(), sPos, ePos); #else - context->drawHighlightForText(font, TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, -======= context->drawHighlightForText(font, TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), ->>>>>>> webkit.org at r78450 !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()), localOrigin, selHeight, c, style->colorSpace(), sPos, ePos); #endif @@ -1001,15 +985,11 @@ void InlineTextBox::paintSpellingOrGrammarMarker(GraphicsContext* pt, const IntP int deltaY = renderer()->style()->isFlippedLinesWritingMode() ? selectionBottom() - logicalBottom() : logicalTop() - selectionTop(); int selHeight = selectionHeight(); IntPoint startPoint(boxOrigin.x(), boxOrigin.y() - deltaY); -<<<<<<< HEAD - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); + TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); #ifdef ANDROID_DISABLE_ROUNDING_HACKS if (m_disableRoundingHacks) run.disableRoundingHacks(); #endif -======= - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); ->>>>>>> webkit.org at r78450 IntRect markerRect = enclosingIntRect(font.selectionRectForText(run, startPoint, selHeight, startPosition, endPosition)); start = markerRect.x() - startPoint.x(); @@ -1053,15 +1033,11 @@ void InlineTextBox::paintTextMatchMarker(GraphicsContext* pt, const IntPoint& bo int sPos = max(marker.startOffset - m_start, (unsigned)0); int ePos = min(marker.endOffset - m_start, (unsigned)m_len); -<<<<<<< HEAD - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); + TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); #ifdef ANDROID_DISABLE_ROUNDING_HACKS if (m_disableRoundingHacks) run.disableRoundingHacks(); #endif -======= - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); ->>>>>>> webkit.org at r78450 // Always compute and store the rect associated with this marker. The computed rect is in absolute coordinates. IntRect markerRect = enclosingIntRect(font.selectionRectForText(run, IntPoint(m_x, selectionTop()), selHeight, sPos, ePos)); @@ -1089,15 +1065,11 @@ void InlineTextBox::computeRectForReplacementMarker(const DocumentMarker& marker int sPos = max(marker.startOffset - m_start, (unsigned)0); int ePos = min(marker.endOffset - m_start, (unsigned)m_len); -<<<<<<< HEAD - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); + TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); #ifdef ANDROID_DISABLE_ROUNDING_HACKS if (m_disableRoundingHacks) run.disableRoundingHacks(); #endif -======= - TextRun run(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); ->>>>>>> webkit.org at r78450 IntPoint startPoint = IntPoint(m_x, y); // Compute and store the rect associated with this marker. @@ -1256,7 +1228,7 @@ int InlineTextBox::offsetForPosition(int lineOffset, bool includePartialGlyphs) RenderStyle* style = text->style(m_firstLine); const Font* f = &style->font(); #ifdef ANDROID_DISABLE_ROUNDING_HACKS - TextRun textRun = TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); + TextRun textRun = TextRun(textRenderer()->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride || style->visuallyOrdered()); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); int offset = f->offsetForPosition(textRun, lineOffset - logicalLeft(), includePartialGlyphs); @@ -1283,20 +1255,15 @@ int InlineTextBox::positionForOffset(int offset) const int from = !isLeftToRightDirection() ? offset - m_start : 0; int to = !isLeftToRightDirection() ? m_len : offset - m_start; // FIXME: Do we need to add rightBearing here? -<<<<<<< HEAD #ifdef ANDROID_DISABLE_ROUNDING_HACKS - TextRun textRun = TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride); + TextRun textRun = TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride); if (m_disableRoundingHacks) textRun.disableRoundingHacks(); return enclosingIntRect(f.selectionRectForText(textRun, IntPoint(logicalLeft(), 0), 0, from, to)).right(); #else - return enclosingIntRect(f.selectionRectForText(TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_toAdd, !isLeftToRightDirection(), m_dirOverride), - IntPoint(logicalLeft(), 0), 0, from, to)).right(); -#endif -======= return enclosingIntRect(f.selectionRectForText(TextRun(text->text()->characters() + m_start, m_len, textRenderer()->allowTabs(), textPos(), m_expansion, trailingExpansionBehavior(), !isLeftToRightDirection(), m_dirOverride), IntPoint(logicalLeft(), 0), 0, from, to)).maxX(); ->>>>>>> webkit.org at r78450 +#endif } bool InlineTextBox::containsCaretOffset(int offset) const diff --git a/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/Source/WebCore/rendering/RenderBlockLineLayout.cpp index 00c2d86..5e2b52d 100644 --- a/Source/WebCore/rendering/RenderBlockLineLayout.cpp +++ b/Source/WebCore/rendering/RenderBlockLineLayout.cpp @@ -42,7 +42,13 @@ #include <wtf/RefCountedLeakCounter.h> #include <wtf/StdLibExtras.h> #include <wtf/Vector.h> -<<<<<<< HEAD +#include <wtf/unicode/CharacterNames.h> + +#if ENABLE(SVG) +#include "RenderSVGInlineText.h" +#include "SVGRootInlineBox.h" +#endif + #ifdef ANDROID_LAYOUT #include "Frame.h" #include "FrameTree.h" @@ -50,14 +56,6 @@ #include "Text.h" #include "HTMLNames.h" #endif // ANDROID_LAYOUT -======= -#include <wtf/unicode/CharacterNames.h> ->>>>>>> webkit.org at r78450 - -#if ENABLE(SVG) -#include "RenderSVGInlineText.h" -#include "SVGRootInlineBox.h" -#endif using namespace std; using namespace WTF; diff --git a/Source/WebKit/android/jni/MIMETypeRegistry.cpp b/Source/WebKit/android/jni/MIMETypeRegistry.cpp index 40f8cef..cbfef6c 100644 --- a/Source/WebKit/android/jni/MIMETypeRegistry.cpp +++ b/Source/WebKit/android/jni/MIMETypeRegistry.cpp @@ -41,6 +41,7 @@ namespace WebCore { String MIMETypeRegistry::getMIMETypeForExtension(const String& ext) { + ASSERT(isMainThread()); JNIEnv* env = JSC::Bindings::getJNIEnv(); jclass mimeClass = env->FindClass("android/webkit/MimeTypeMap"); LOG_ASSERT(mimeClass, "Could not find class MimeTypeMap"); |