diff options
29 files changed, 62 insertions, 468 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 091ba4f..dbe2f8e 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -546,10 +546,7 @@ // This prevents unnecessary invals. #define ENABLE_TEXT_CARET 1 #define ENABLE_JAVASCRIPT_DEBUGGER 0 -<<<<<<< HEAD:JavaScriptCore/wtf/Platform.h #define ENABLE_ORIENTATION_EVENTS 1 -======= ->>>>>>> webkit.org at r51976:JavaScriptCore/wtf/Platform.h #endif #if PLATFORM(WIN) diff --git a/WebCore/bindings/js/JSCanvasArrayCustom.cpp b/WebCore/bindings/js/JSCanvasArrayCustom.cpp deleted file mode 100644 index 820f473..0000000 --- a/WebCore/bindings/js/JSCanvasArrayCustom.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2009 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" - -#if ENABLE(3D_CANVAS) - -#include "JSCanvasArray.h" -#include "JSCanvasByteArray.h" -#include "JSCanvasUnsignedByteArray.h" -#include "JSCanvasShortArray.h" -#include "JSCanvasUnsignedShortArray.h" -#include "JSCanvasIntArray.h" -#include "JSCanvasUnsignedIntArray.h" -#include "JSCanvasFloatArray.h" - -#include "CanvasArray.h" - -using namespace JSC; - -namespace WebCore { - -JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, CanvasArray* object) -{ - if (object->isFloatArray()) - return getDOMObjectWrapper<JSCanvasFloatArray>(exec, globalObject, static_cast<CanvasFloatArray*>(object)); - if (object->isUnsignedByteArray()) - return getDOMObjectWrapper<JSCanvasUnsignedByteArray>(exec, globalObject, static_cast<CanvasUnsignedByteArray*>(object)); - if (object->isByteArray()) - return getDOMObjectWrapper<JSCanvasByteArray>(exec, globalObject, static_cast<CanvasByteArray*>(object)); - if (object->isIntArray()) - return getDOMObjectWrapper<JSCanvasIntArray>(exec, globalObject, static_cast<CanvasIntArray*>(object)); - if (object->isUnsignedIntArray()) - return getDOMObjectWrapper<JSCanvasUnsignedIntArray>(exec, globalObject, static_cast<CanvasUnsignedIntArray*>(object)); - if (object->isShortArray()) - return getDOMObjectWrapper<JSCanvasShortArray>(exec, globalObject, static_cast<CanvasShortArray*>(object)); - if (object->isUnsignedShortArray()) - return getDOMObjectWrapper<JSCanvasUnsignedShortArray>(exec, globalObject, static_cast<CanvasUnsignedShortArray*>(object)); - return jsUndefined(); -} - -} // namespace WebCore - -#endif // ENABLE(3D_CANVAS) diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp index 06b2fe5..7b951bd 100644 --- a/WebCore/bindings/js/JSEventCustom.cpp +++ b/WebCore/bindings/js/JSEventCustom.cpp @@ -116,15 +116,12 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event) else if (event->isSVGZoomEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, SVGZoomEvent, event); #endif -<<<<<<< HEAD:WebCore/bindings/js/JSEventCustom.cpp + else if (event->isCompositionEvent()) + wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CompositionEvent, event); #if ENABLE(TOUCH_EVENTS) // Android else if (event->isTouchEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TouchEvent, event); #endif -======= - else if (event->isCompositionEvent()) - wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CompositionEvent, event); ->>>>>>> webkit.org at r51976:WebCore/bindings/js/JSEventCustom.cpp else wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, UIEvent, event); } else if (event->isMutationEvent()) diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp index 3de3b23..89f2345 100644 --- a/WebCore/bindings/js/ScriptController.cpp +++ b/WebCore/bindings/js/ScriptController.cpp @@ -245,18 +245,13 @@ bool ScriptController::processingUserGestureEvent() const type == eventNames().clickEvent || type == eventNames().mousedownEvent || type == eventNames().mouseupEvent || type == eventNames().dblclickEvent // keyboard events -<<<<<<< HEAD:WebCore/bindings/js/ScriptController.cpp - type == eventNames().keydownEvent || type == eventNames().keypressEvent || - type == eventNames().keyupEvent || + || type == eventNames().keydownEvent || type == eventNames().keypressEvent + || type == eventNames().keyupEvent #if ENABLE(TOUCH_EVENTS) // Android // touch events - type == eventNames().touchstartEvent || type == eventNames().touchmoveEvent || - type == eventNames().touchendEvent || type == eventNames().touchcancelEvent || + || type == eventNames().touchstartEvent || type == eventNames().touchmoveEvent + || type == eventNames().touchendEvent || type == eventNames().touchcancelEvent #endif -======= - || type == eventNames().keydownEvent || type == eventNames().keypressEvent - || type == eventNames().keyupEvent ->>>>>>> webkit.org at r51976:WebCore/bindings/js/ScriptController.cpp // other accepted events || type == eventNames().selectEvent || type == eventNames().changeEvent || type == eventNames().focusEvent || type == eventNames().blurEvent diff --git a/WebCore/bindings/js/ScriptObject.cpp b/WebCore/bindings/js/ScriptObject.cpp index 0e62903..03ecfc6 100644 --- a/WebCore/bindings/js/ScriptObject.cpp +++ b/WebCore/bindings/js/ScriptObject.cpp @@ -36,15 +36,9 @@ #include <runtime/JSLock.h> #if ENABLE(INSPECTOR) -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -======= #include "JSInjectedScriptHost.h" ->>>>>>> webkit.org at r51976:WebCore/bindings/js/ScriptObject.cpp #include "JSInspectorBackend.h" -<<<<<<< HEAD:WebCore/bindings/js/ScriptObject.cpp -======= #include "JSInspectorFrontendHost.h" ->>>>>>> webkit.org at r51976:WebCore/bindings/js/ScriptObject.cpp #endif using namespace JSC; diff --git a/WebCore/bindings/v8/V8DOMWrapper.cpp b/WebCore/bindings/v8/V8DOMWrapper.cpp index 7ecc29c..a31c5bd 100644 --- a/WebCore/bindings/v8/V8DOMWrapper.cpp +++ b/WebCore/bindings/v8/V8DOMWrapper.cpp @@ -1541,20 +1541,12 @@ PassRefPtr<EventListener> V8DOMWrapper::getEventListener(Node* node, v8::Local<v return (lookup == ListenerFindOnly) ? V8EventListenerList::findWrapper(value, isAttribute) : V8EventListenerList::findOrCreateWrapper<V8EventListener>(value, isAttribute); } -<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8DOMWrapper.cpp #if ENABLE(SVG) PassRefPtr<EventListener> V8DOMWrapper::getEventListener(SVGElementInstance* element, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup) { return getEventListener(element->correspondingElement(), value, isAttribute, lookup); } #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8DOMWrapper.cpp -#endif -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8DOMWrapper.cpp PassRefPtr<EventListener> V8DOMWrapper::getEventListener(AbstractWorker* worker, v8::Local<v8::Value> value, bool isAttribute, ListenerLookupType lookup) { diff --git a/WebCore/bindings/v8/V8Index.cpp b/WebCore/bindings/v8/V8Index.cpp index 7acaf89..9686dc6 100644 --- a/WebCore/bindings/v8/V8Index.cpp +++ b/WebCore/bindings/v8/V8Index.cpp @@ -446,7 +446,6 @@ #include "V8Geoposition.h" #include "V8PositionError.h" -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.cpp #if PLATFORM(ANDROID) // TODO: Upstream these guards to webkit.org #if ENABLE(TOUCH_EVENTS) @@ -458,8 +457,6 @@ #include "V8VoidCallback.h" #endif // PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Index.cpp namespace WebCore { FunctionTemplateFactory V8ClassIndex::GetFactory(V8WrapperType type) diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h index 6184f5a..d786aab 100644 --- a/WebCore/bindings/v8/V8Index.h +++ b/WebCore/bindings/v8/V8Index.h @@ -502,7 +502,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); V(GEOPOSITION, Geoposition) \ V(POSITIONERROR, PositionError) -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h #if PLATFORM(ANDROID) // TODO: Upstream this guard. #if ENABLE(TOUCH_EVENTS) @@ -524,8 +523,6 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); #if PLATFORM(ANDROID) // This block is modified, but is not Android-specific. -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Index.h #define DOM_OBJECT_TYPES(V) \ DOM_OBJECT_TYPES_1(V) \ DOM_OBJECT_TYPES_2(V) \ @@ -536,14 +533,10 @@ typedef v8::Persistent<v8::FunctionTemplate> (*FunctionTemplateFactory)(); DOM_OBJECT_XPATH_TYPES(V) \ DOM_OBJECT_XSLT_TYPES(V) \ DOM_OBJECT_INSPECTOR_TYPES(V) \ -<<<<<<< HEAD:WebCore/bindings/v8/V8Index.h DOM_OBJECT_GEOLOCATION_TYPES(V) \ DOM_OBJECT_TOUCH_EVENT_TYPES(V) \ DOM_OBJECT_VOIDCALLBACK_TYPES(V) #endif -======= - DOM_OBJECT_GEOLOCATION_TYPES(V) ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Index.h #if ENABLE(SVG) // SVG_OBJECT_TYPES are svg non-node, non-pod types. diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index c016d90..e3430b2 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -465,21 +465,16 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod // this based on whether the script source has a URL. result = runScript(script, source.url().string().isNull()); } -#if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - ChromiumBridge::traceEventEnd("v8.run", node, ""); -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp -======= #if ENABLE(INSPECTOR) if (InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0) timelineAgent->didEvaluateScript(); ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp #endif -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp +#if PLATFORM(CHROMIUM) + // TODO(andreip): upstream CHROMIUM guards to webkit.org + ChromiumBridge::traceEventEnd("v8.run", node, ""); +#endif return result; } @@ -553,13 +548,10 @@ v8::Local<v8::Value> V8Proxy::runScriptInternal(v8::Handle<v8::Script> script, b v8::Local<v8::Value> V8Proxy::callFunction(v8::Handle<v8::Function> function, v8::Handle<v8::Object> receiver, int argc, v8::Handle<v8::Value> args[]) { -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp #ifdef ANDROID_INSTRUMENT android::TimeCounter::start(android::TimeCounter::JavaScriptExecuteTimeCounter); #endif -======= V8GCController::checkMemoryUsage(); ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp v8::Local<v8::Value> result; { V8ConsoleMessage::Scope scope; @@ -711,63 +703,6 @@ V8Proxy* V8Proxy::retrieve(ScriptExecutionContext* context) void V8Proxy::disconnectFrame() { -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - disconnectEventListeners(); -} - -bool V8Proxy::isEnabled() -{ - Settings* settings = m_frame->settings(); - if (!settings) - return false; - - // In the common case, JavaScript is enabled and we're done. - if (settings->isJavaScriptEnabled()) - return true; - - // If JavaScript has been disabled, we need to look at the frame to tell - // whether this script came from the web or the embedder. Scripts from the - // embedder are safe to run, but scripts from the other sources are - // disallowed. - Document* document = m_frame->document(); - if (!document) - return false; - - SecurityOrigin* origin = document->securityOrigin(); - if (origin->protocol().isEmpty()) - return false; // Uninitialized document - - if (origin->protocol() == "http" || origin->protocol() == "https") - return false; // Web site - - // FIXME: the following are application decisions, and they should - // not be made at this layer. instead, we should bridge out to the - // embedder to allow them to override policy here. - -#if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - if (origin->protocol() == ChromiumBridge::uiResourceProtocol()) - return true; // Embedder's scripts are ok to run -#endif - - // If the scheme is ftp: or file:, an empty file name indicates a directory - // listing, which requires JavaScript to function properly. - const char* kDirProtocols[] = { "ftp", "file" }; -#if PLATFORM(ANDROID) - // TODO(andreip): Port arraysize function to Android. There's one in Gears. - for (size_t i = 0; i < 2; ++i) { -#else - for (size_t i = 0; i < arraysize(kDirProtocols); ++i) { -#endif - if (origin->protocol() == kDirProtocols[i]) { - const KURL& url = document->url(); - return url.pathAfterLastSlash() == url.pathEnd(); - } - } - - return false; // Other protocols fall through to here -======= ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp } void V8Proxy::updateDocumentWrapper(v8::Handle<v8::Value> wrapper) @@ -1238,17 +1173,14 @@ void V8Proxy::initContextIfNeeded() setSecurityToken(); m_frame->loader()->client()->didCreateScriptContextForFrame(); -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - m_frame->loader()->dispatchWindowObjectAvailable(); -#ifdef ANDROID_INSTRUMENT - android::TimeCounter::record(android::TimeCounter::JavaScriptInitTimeCounter, __FUNCTION__); -#endif -======= // FIXME: This is wrong. We should actually do this for the proper world once // we do isolated worlds the WebCore way. m_frame->loader()->dispatchDidClearWindowObjectInWorld(0); ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp + +#ifdef ANDROID_INSTRUMENT + android::TimeCounter::record(android::TimeCounter::JavaScriptInitTimeCounter, __FUNCTION__); +#endif } void V8Proxy::setDOMException(int exceptionCode) @@ -1430,21 +1362,13 @@ bool V8Proxy::sourceLineNumber(int& result) v8::Handle<v8::Function> frameSourceLine; frameSourceLine = v8::Local<v8::Function>::Cast(v8UtilityContext->Global()->Get(v8::String::New("frameSourceLine"))); if (frameSourceLine.IsEmpty()) -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - return 0; - v8::Handle<v8::Value> result = v8::Debug::Call(frameSourceLine); - if (result.IsEmpty()) - return 0; - return result->Int32Value(); -#endif -======= return false; v8::Handle<v8::Value> value = v8::Debug::Call(frameSourceLine); if (value.IsEmpty()) return false; result = value->Int32Value(); return true; ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp +#endif } bool V8Proxy::sourceName(String& result) @@ -1460,18 +1384,13 @@ bool V8Proxy::sourceName(String& result) v8::Handle<v8::Function> frameSourceName; frameSourceName = v8::Local<v8::Function>::Cast(v8UtilityContext->Global()->Get(v8::String::New("frameSourceName"))); if (frameSourceName.IsEmpty()) -<<<<<<< HEAD:WebCore/bindings/v8/V8Proxy.cpp - return String(); - return toWebCoreString(v8::Debug::Call(frameSourceName)); -#endif -======= return false; v8::Handle<v8::Value> value = v8::Debug::Call(frameSourceName); if (value.IsEmpty()) return false; result = toWebCoreString(value); return true; ->>>>>>> webkit.org at r51976:WebCore/bindings/v8/V8Proxy.cpp +#endif } void V8Proxy::registerExtensionWithV8(v8::Extension* extension) diff --git a/WebCore/config.h b/WebCore/config.h index 31b4c17..907b0d5 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -75,18 +75,12 @@ #endif /* PLATFORM(WIN_OS) */ -<<<<<<< HEAD:WebCore/config.h // ANDROID def should be after all PLATFORM to avoid override. -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #if PLATFORM(ANDROID) #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." // This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 -<<<<<<< HEAD:WebCore/config.h #define ANDROID_MOBILE // change can be merged back to WebKit.org for MOBILE -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #define LOG_DISABLED 1 #include <wtf/Assertions.h> // Central place to set which optional features Android uses. @@ -99,7 +93,7 @@ #endif #define ENABLE_VIDEO 1 #define ENABLE_WORKERS 1 -<<<<<<< HEAD:WebCore/config.h + #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) #define ENABLE_SVG_ANIMATION 0 // to enable: @@ -113,28 +107,19 @@ #define ENABLE_SVG_FOREIGN_OBJECT 1 #define ENABLE_SVG_USE 1 #endif -======= ->>>>>>> webkit.org at r51976:WebCore/config.h + #define ENABLE_XBL 0 #define ENABLE_XPATH 0 #define ENABLE_XSLT 0 -<<<<<<< HEAD:WebCore/config.h - #undef ENABLE_ARCHIVE // Enabled by default in Platform.h -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #define ENABLE_ARCHIVE 0 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 -<<<<<<< HEAD:WebCore/config.h #define ENABLE_TOUCH_EVENTS 1 -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #undef ENABLE_GEOLOCATION // Disabled by default in Platform.h #define ENABLE_GEOLOCATION 1 #undef ENABLE_INSPECTOR // Enabled by default in Platform.h #define ENABLE_INSPECTOR 0 #define ENABLE_EVENT_SOURCE 0 -<<<<<<< HEAD:WebCore/config.h #define FLATTEN_FRAMESET #define FLATTEN_IFRAME @@ -211,8 +196,6 @@ // a page is cached. Invoke loadEvent when a page is restored. #define ANDROID_PAGE_CACHE_UNLOAD -======= ->>>>>>> webkit.org at r51976:WebCore/config.h #endif /* PLATFORM(ANDROID) */ #ifdef __cplusplus diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp index ba6dc97..85966d7 100644 --- a/WebCore/dom/Document.cpp +++ b/WebCore/dom/Document.cpp @@ -387,14 +387,11 @@ Document::Document(Frame* frame, bool isXHTML) m_ignoreAutofocus = false; m_frame = frame; -<<<<<<< HEAD:WebCore/dom/Document.cpp - m_renderArena = 0; -#if !PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/dom/Document.cpp +#if !PLATFORM(ANDROID) m_axObjectCache = 0; -#endif +#endif + m_docLoader = new DocLoader(this); visuallyOrdered = false; @@ -1439,6 +1436,7 @@ void Document::attach() #if !PLATFORM(ANDROID) ASSERT(!m_axObjectCache); #endif + if (!m_renderArena) m_renderArena = new RenderArena(); diff --git a/WebCore/history/CachedFrame.cpp b/WebCore/history/CachedFrame.cpp index 227c437..a868134 100644 --- a/WebCore/history/CachedFrame.cpp +++ b/WebCore/history/CachedFrame.cpp @@ -99,13 +99,10 @@ void CachedFrameBase::restore() for (unsigned i = 0; i < m_childFrames.size(); ++i) m_childFrames[i]->open(); -<<<<<<< HEAD:WebCore/history/CachedFrame.cpp #ifdef ANDROID_PAGE_CACHE_UNLOAD // matches pageshowEvent as in Document::implicitClose() m_document->dispatchWindowLoadEvent(); #endif -======= ->>>>>>> webkit.org at r51976:WebCore/history/CachedFrame.cpp m_document->dispatchWindowEvent(PageTransitionEvent::create(eventNames().pageshowEvent, true), m_document); } diff --git a/WebCore/history/HistoryItem.cpp b/WebCore/history/HistoryItem.cpp index f6fbd59..21e67ca 100644 --- a/WebCore/history/HistoryItem.cpp +++ b/WebCore/history/HistoryItem.cpp @@ -393,8 +393,6 @@ void HistoryItem::setIsTargetItem(bool flag) #if PLATFORM(ANDROID) notifyHistoryItemChanged(this); #endif -<<<<<<< HEAD:WebCore/history/HistoryItem.cpp -======= } void HistoryItem::setStateObject(PassRefPtr<SerializedScriptValue> object) @@ -421,7 +419,6 @@ void HistoryItem::documentDetached(Document* document) ASSERT_UNUSED(document, m_document == document); m_document = 0; m_stateObject = 0; ->>>>>>> webkit.org at r51976:WebCore/history/HistoryItem.cpp } void HistoryItem::addChildItem(PassRefPtr<HistoryItem> child) diff --git a/WebCore/history/android/AndroidWebHistoryBridge.h b/WebCore/history/android/AndroidWebHistoryBridge.h index c6d5147..b401933 100644 --- a/WebCore/history/android/AndroidWebHistoryBridge.h +++ b/WebCore/history/android/AndroidWebHistoryBridge.h @@ -34,19 +34,11 @@ class HistoryItem; class AndroidWebHistoryBridge : public RefCounted<AndroidWebHistoryBridge> { public: -<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h AndroidWebHistoryBridge(HistoryItem* item) -======= - AndroidWebHistoryBridge() ->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h : m_scale(100) , m_screenWidthScale(100) , m_active(false) -<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h , m_historyItem(item) { } -======= - , m_historyItem(0) { } ->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h virtual ~AndroidWebHistoryBridge() { } virtual void updateHistoryItem(HistoryItem* item) = 0; @@ -54,10 +46,7 @@ public: void setScreenWidthScale(int s) { m_screenWidthScale = s; } int scale() const { return m_scale; } int screenWidthScale() const { return m_screenWidthScale; } -<<<<<<< HEAD:WebCore/history/android/AndroidWebHistoryBridge.h void detachHistoryItem() { m_historyItem = 0; } -======= ->>>>>>> webkit.org at r51976:WebCore/history/android/AndroidWebHistoryBridge.h HistoryItem* historyItem() const { return m_historyItem; } void setActive() { m_active = true; } diff --git a/WebCore/html/HTMLInputElement.cpp b/WebCore/html/HTMLInputElement.cpp index 85fa64d..163424d 100644 --- a/WebCore/html/HTMLInputElement.cpp +++ b/WebCore/html/HTMLInputElement.cpp @@ -62,13 +62,10 @@ #include "RenderTheme.h" #include "StringHash.h" #include "TextEvent.h" -<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp #ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS #include "WebViewCore.h" #endif -======= #include <wtf/HashMap.h> ->>>>>>> webkit.org at r51976:WebCore/html/HTMLInputElement.cpp #include <wtf/MathExtras.h> #include <wtf/StdLibExtras.h> #include <wtf/dtoa.h> @@ -587,59 +584,12 @@ static const InputTypeMap* createTypeMap() void HTMLInputElement::setInputType(const String& t) { -<<<<<<< HEAD:WebCore/html/HTMLInputElement.cpp - InputType newType; - - if (equalIgnoringCase(t, "password")) -#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - { - if (document()->focusedNode() == this) - { - android::WebViewCore::getWebViewCore(document()->view())->updateTextfield(this, true, String()); - } -#endif - newType = PASSWORD; -#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - } -#endif - else if (equalIgnoringCase(t, "checkbox")) - newType = CHECKBOX; - else if (equalIgnoringCase(t, "radio")) - newType = RADIO; - else if (equalIgnoringCase(t, "submit")) - newType = SUBMIT; - else if (equalIgnoringCase(t, "reset")) - newType = RESET; - else if (equalIgnoringCase(t, "file")) - newType = FILE; - else if (equalIgnoringCase(t, "hidden")) - newType = HIDDEN; - else if (equalIgnoringCase(t, "image")) - newType = IMAGE; - else if (equalIgnoringCase(t, "button")) - newType = BUTTON; - else if (equalIgnoringCase(t, "khtml_isindex")) - newType = ISINDEX; - else if (equalIgnoringCase(t, "search")) - newType = SEARCH; - else if (equalIgnoringCase(t, "range")) - newType = RANGE; - else if (equalIgnoringCase(t, "email")) - newType = EMAIL; - else if (equalIgnoringCase(t, "number")) - newType = NUMBER; - else if (equalIgnoringCase(t, "tel")) - newType = TELEPHONE; - else if (equalIgnoringCase(t, "url")) - newType = URL; - else if (equalIgnoringCase(t, "color")) - newType = COLOR; - else - newType = TEXT; -======= static const InputTypeMap* typeMap = createTypeMap(); InputType newType = t.isNull() ? TEXT : typeMap->get(t); ->>>>>>> webkit.org at r51976:WebCore/html/HTMLInputElement.cpp +#ifdef ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS + if (newType == PASSWORD && document()->focusedNode() == this) + android::WebViewCore::getWebViewCore(document()->view())->updateTextfield(this, true, String()); +#endif // 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/EmptyClients.h b/WebCore/loader/EmptyClients.h index c6ae799..e4b9af5 100644 --- a/WebCore/loader/EmptyClients.h +++ b/WebCore/loader/EmptyClients.h @@ -288,13 +288,8 @@ public: virtual void updateGlobalHistory() { } virtual void updateGlobalHistoryRedirectLinks() { } virtual bool shouldGoToHistoryItem(HistoryItem*) const { return false; } -<<<<<<< HEAD:WebCore/loader/EmptyClients.h - virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } - virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { } -======= virtual void dispatchDidAddBackForwardItem(HistoryItem*) const { } virtual void dispatchDidRemoveBackForwardItem(HistoryItem*) const { }; ->>>>>>> webkit.org at r51976:WebCore/loader/EmptyClients.h virtual void dispatchDidChangeBackForwardIndex() const { } virtual void saveViewStateToItem(HistoryItem*) { } virtual bool canCachePage() const { return false; } diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 22399b0..4a6ca3d 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -537,10 +537,7 @@ void FrameLoader::stopLoading(UnloadEventPolicy unloadEventPolicy, DatabasePolic if (m_frame->domWindow()) { if (unloadEventPolicy == UnloadEventPolicyUnloadAndPageHide) m_frame->domWindow()->dispatchEvent(PageTransitionEvent::create(eventNames().pagehideEvent, m_frame->document()->inPageCache()), m_frame->document()); -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp #ifndef ANDROID_PAGE_CACHE_UNLOAD -======= ->>>>>>> webkit.org at r51976:WebCore/loader/FrameLoader.cpp if (!m_frame->document()->inPageCache()) #endif m_frame->domWindow()->dispatchEvent(Event::create(eventNames().unloadEvent, false, false), m_frame->domWindow()->document()); @@ -1746,7 +1743,12 @@ void FrameLoader::setFirstPartyForCookies(const KURL& url) // This does the same kind of work that didOpenURL does, except it relies on the fact // that a higher level already checked that the URLs match and the scrolling is the right thing to do. +#if PLATFORM(ANDROID) +// TODO: Upstream to webkit.org +void FrameLoader::loadInSameDocument(const KURL& url, SerializedScriptValue* stateObject, bool isNewNavigation, bool suppressAddToHistory) +#else void FrameLoader::loadInSameDocument(const KURL& url, SerializedScriptValue* stateObject, bool isNewNavigation) +#endif { // If we have a state object, we cannot also be a new navigation. ASSERT(!stateObject || (stateObject && !isNewNavigation)); @@ -1754,7 +1756,12 @@ void FrameLoader::loadInSameDocument(const KURL& url, SerializedScriptValue* sta // Update the data source's request with the new URL to fake the URL change m_frame->document()->setURL(url); documentLoader()->replaceRequestURLForSameDocumentNavigation(url); +#if PLATFORM(ANDROID) + // TODO: Upstream to webkit.org + if (isNewNavigation && !shouldTreatURLAsSameAsCurrent(url) && !stateObject && !suppressAddToHistory) { +#else if (isNewNavigation && !shouldTreatURLAsSameAsCurrent(url) && !stateObject) { +#endif // NB: must happen after replaceRequestURLForSameDocumentNavigation(), since we add // based on the current request. Must also happen before we openURL and displace the // scroll position, since adding the BF item will save away scroll state. @@ -3470,46 +3477,15 @@ void FrameLoader::continueFragmentScrollAfterNavigationPolicy(const ResourceRequ if (!shouldContinue) return; -<<<<<<< HEAD:WebCore/loader/FrameLoader.cpp - KURL url = request.url(); - - m_documentLoader->replaceRequestURLForAnchorScroll(url); + bool isRedirect = m_quickRedirectComing || policyChecker()->loadType() == FrameLoadTypeRedirectWithLockedBackForwardList; #ifdef ANDROID_USER_GESTURE // Do not add history items for a fragment scroll not initiated by the // user. http://bugs.webkit.org/show_bug.cgi?id=30224 - if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url) - && (isProcessingUserGesture() || request.getUserGesture())) { + bool isUserInitiated = isProcessingUserGesture() || request.getUserGesture(); + loadInSameDocument(request.url(), 0, !isRedirect, !isUserInitiated); #else - if (!isRedirect && !shouldTreatURLAsSameAsCurrent(url)) { -#endif - // NB: must happen after _setURL, since we add based on the current request. - // Must also happen before we openURL and displace the scroll position, since - // adding the BF item will save away scroll state. - - // NB2: If we were loading a long, slow doc, and the user anchor nav'ed before - // it was done, currItem is now set the that slow doc, and prevItem is whatever was - // before it. Adding the b/f item will bump the slow doc down to prevItem, even - // though its load is not yet done. I think this all works out OK, for one because - // we have already saved away the scroll and doc state for the long slow load, - // but it's not an obvious case. - - history()->updateBackForwardListForFragmentScroll(); - } - - scrollToAnchor(url); - - if (!isRedirect) - // This will clear previousItem from the rest of the frame tree that didn't - // doing any loading. We need to make a pass on this now, since for anchor nav - // we'll not go through a real load and reach Completed state. - checkLoadComplete(); - - m_client->dispatchDidChangeLocationWithinPage(); - m_client->didFinishLoad(); -======= - bool isRedirect = m_quickRedirectComing || policyChecker()->loadType() == FrameLoadTypeRedirectWithLockedBackForwardList; loadInSameDocument(request.url(), 0, !isRedirect); ->>>>>>> webkit.org at r51976:WebCore/loader/FrameLoader.cpp +#endif } bool FrameLoader::shouldScrollToAnchor(bool isFormSubmission, FrameLoadType loadType, const KURL& url) @@ -3797,7 +3773,12 @@ void FrameLoader::navigateWithinDocument(HistoryItem* item) history()->setCurrentItem(item); // loadInSameDocument() actually changes the URL and notifies load delegates of a "fake" load +#if PLATFORM(ANDROID) + // TODO: Upstream to webkit.org + loadInSameDocument(item->url(), item->stateObject(), false, false); +#else loadInSameDocument(item->url(), item->stateObject(), false); +#endif // Restore user view state from the current history item here since we don't do a normal load. // Even though we just manually set the current history item, this ASSERT verifies nothing diff --git a/WebCore/loader/FrameLoader.h b/WebCore/loader/FrameLoader.h index 875736f..03a1175 100644 --- a/WebCore/loader/FrameLoader.h +++ b/WebCore/loader/FrameLoader.h @@ -439,7 +439,12 @@ private: Frame* loadSubframe(HTMLFrameOwnerElement*, const KURL&, const String& name, const String& referrer); +#if PLATFORM(ANDROID) + // TODO: Upstream to webkit.org + void loadInSameDocument(const KURL&, SerializedScriptValue* stateObject, bool isNewNavigation, bool suppressAddToHistory); +#else void loadInSameDocument(const KURL&, SerializedScriptValue* stateObject, bool isNewNavigation); +#endif void provisionalLoadStarted(); diff --git a/WebCore/page/FrameView.cpp b/WebCore/page/FrameView.cpp index 87d2d6c..b338017 100644 --- a/WebCore/page/FrameView.cpp +++ b/WebCore/page/FrameView.cpp @@ -974,23 +974,14 @@ void FrameView::repaintContentRectangle(const IntRect& r, bool immediate) double delay = adjustedDeferredRepaintDelay(); if ((m_deferringRepaints || m_deferredRepaintTimer.isActive() || delay) && !immediate) { -<<<<<<< HEAD:WebCore/page/FrameView.cpp - IntRect visibleContent = visibleContentRect(); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - IntRect fullVis = visibleContent; -#endif - visibleContent.intersect(r); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - if (r != visibleContent) - ScrollView::platformOffscreenContentRectangle(fullVis, r); -#endif - if (visibleContent.isEmpty()) -======= IntRect paintRect = r; if (!paintsEntireContents()) paintRect.intersect(visibleContentRect()); +#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS + if (r != paintRect) + ScrollView::platformOffscreenContentRectangle(visibleContentRect(), r); +#endif if (paintRect.isEmpty()) ->>>>>>> webkit.org at r51976:WebCore/page/FrameView.cpp return; if (m_repaintCount == cRepaintRectUnionThreshold) { IntRect unionedRect; diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index 561d19c..b94947e 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -87,13 +87,8 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) { m_timer.stop(); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp - // Cache our pointer to the Geolocation object, as this object could be - // deleted by a call to clearWatch in a callback. -======= // Cache our pointer to the Geolocation object, as this GeoNotifier object // could be deleted by a call to clearWatch in a callback. ->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp Geolocation* geolocation = m_geolocation; if (m_fatalError) { @@ -101,15 +96,12 @@ void Geolocation::GeoNotifier::timerFired(Timer<GeoNotifier>*) m_errorCallback->handleEvent(m_fatalError.get()); // This will cause this notifier to be deleted. geolocation->fatalErrorOccurred(this); -<<<<<<< HEAD:WebCore/page/Geolocation.cpp return; } if (m_cachedPosition) { m_successCallback->handleEvent(m_cachedPosition.get()); geolocation->requestReturnedCachedPosition(this); -======= ->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp return; } @@ -370,7 +362,6 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi if (isDenied()) notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage)); else { -<<<<<<< HEAD:WebCore/page/Geolocation.cpp if (haveSuitableCachedPosition(notifier->m_options.get())) { ASSERT(m_cachedPositionManager->cachedPosition()); if (isAllowed()) @@ -383,14 +374,8 @@ PassRefPtr<Geolocation::GeoNotifier> Geolocation::startRequest(PassRefPtr<Positi if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get())) notifier->startTimerIfNeeded(); else - notifier->setFatalError(PositionError::create(PositionError::UNKNOWN_ERROR, "Failed to start Geolocation service")); + notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "Failed to start Geolocation service")); } -======= - if (notifier->hasZeroTimeout() || m_service->startUpdating(notifier->m_options.get())) - notifier->startTimerIfNeeded(); - else - notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, "Failed to start Geolocation service")); ->>>>>>> webkit.org at r51976:WebCore/page/Geolocation.cpp } return notifier.release(); diff --git a/WebCore/platform/ScrollView.cpp b/WebCore/platform/ScrollView.cpp index 6df462a..19a1dca 100644 --- a/WebCore/platform/ScrollView.cpp +++ b/WebCore/platform/ScrollView.cpp @@ -1,4 +1,3 @@ - /* * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved. * @@ -718,23 +717,14 @@ void ScrollView::frameRectsChanged() void ScrollView::repaintContentRectangle(const IntRect& rect, bool now) { -<<<<<<< HEAD:WebCore/platform/ScrollView.cpp - IntRect visibleContent = visibleContentRect(); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - IntRect fullVis = visibleContent; -#endif - visibleContent.intersect(rect); -#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS - if (rect != visibleContent) - platformOffscreenContentRectangle(fullVis, rect); -#endif - if (visibleContent.isEmpty()) -======= IntRect paintRect = rect; if (!paintsEntireContents()) paintRect.intersect(visibleContentRect()); +#ifdef ANDROID_CAPTURE_OFFSCREEN_PAINTS + if (rect != paintRect) + platformOffscreenContentRectangle(visibleContentRect(), rect); +#endif if (paintRect.isEmpty()) ->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp return; if (platformWidget()) { platformRepaintContentRectangle(paintRect, now); @@ -1065,12 +1055,8 @@ bool ScrollView::platformScroll(ScrollDirection, ScrollGranularity) return true; } -<<<<<<< HEAD:WebCore/platform/ScrollView.cpp #if !PLATFORM(ANDROID) -void ScrollView::platformRepaintContentRectangle(const IntRect&, bool now) -======= void ScrollView::platformRepaintContentRectangle(const IntRect&, bool /*now*/) ->>>>>>> webkit.org at r51976:WebCore/platform/ScrollView.cpp { } diff --git a/WebCore/platform/Widget.cpp b/WebCore/platform/Widget.cpp index 2213a11..6196548 100644 --- a/WebCore/platform/Widget.cpp +++ b/WebCore/platform/Widget.cpp @@ -127,11 +127,7 @@ IntPoint Widget::convertFromContainingWindowToRoot(const Widget*, const IntPoint } #endif -<<<<<<< HEAD:WebCore/platform/Widget.cpp -#if !PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID) -======= -#if (!PLATFORM(MAC) && !PLATFORM(GTK)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) ->>>>>>> webkit.org at r51976:WebCore/platform/Widget.cpp +#if (!PLATFORM(MAC) && !PLATFORM(GTK) && !PLATFORM(ANDROID)) || ENABLE(EXPERIMENTAL_SINGLE_VIEW_MODE) void Widget::releasePlatformWidget() { } diff --git a/WebCore/platform/network/ResourceHandleInternal.h b/WebCore/platform/network/ResourceHandleInternal.h index 8313560..f7135ee 100644 --- a/WebCore/platform/network/ResourceHandleInternal.h +++ b/WebCore/platform/network/ResourceHandleInternal.h @@ -218,15 +218,9 @@ namespace WebCore { // It is almost identical to m_currentWebChallenge.nsURLAuthenticationChallenge(), but has a different sender. NSURLAuthenticationChallenge *m_currentMacChallenge; #endif -<<<<<<< HEAD:WebCore/platform/network/ResourceHandleInternal.h -#if USE(CFNETWORK) - CFURLAuthChallengeRef m_currentCFChallenge; -#endif #if PLATFORM(ANDROID) RefPtr<ResourceLoaderAndroid> m_loader; #endif -======= ->>>>>>> webkit.org at r51976:WebCore/platform/network/ResourceHandleInternal.h AuthenticationChallenge m_currentWebChallenge; ResourceHandle::FailureType m_failureType; diff --git a/WebCore/plugins/PluginInfoStore.cpp b/WebCore/plugins/PluginInfoStore.cpp index 9a441f3..88dc7ee 100644 --- a/WebCore/plugins/PluginInfoStore.cpp +++ b/WebCore/plugins/PluginInfoStore.cpp @@ -27,15 +27,7 @@ #include "PluginInfoStore.h" #include "KURL.h" -<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp #include "Page.h" -<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp -#endif -======= ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp #include "PluginData.h" #include "PluginDatabase.h" #include "PluginPackage.h" @@ -102,21 +94,7 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String& mimeType) void refreshPlugins(bool reloadOpenPages) { -<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp -#if PLATFORM(ANDROID) -======= ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp Page::refreshPlugins(reloadOpenPages); -<<<<<<< HEAD:WebCore/plugins/PluginInfoStore.cpp -#else - PluginDatabase::installedPlugins()->refresh(); - - if (reloadOpenPages) { - // FIXME: reload open pages - } -#endif -======= ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginInfoStore.cpp } } diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h index dd2458e..a5618f7 100644 --- a/WebCore/plugins/PluginView.h +++ b/WebCore/plugins/PluginView.h @@ -47,15 +47,11 @@ #include <wtf/RefPtr.h> #include <wtf/Vector.h> -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_SCHEDULE_TIMER #include "PluginTimer.h" #endif -#if PLATFORM(WIN_OS) && PLATFORM(QT) -======= #if PLATFORM(WIN_OS) && (PLATFORM(QT) || PLATFORM(WX)) ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h typedef struct HWND__* HWND; typedef HWND PlatformPluginWidget; #elif defined(ANDROID_PLUGINS) @@ -354,15 +350,11 @@ namespace WebCore { bool m_haveUpdatedPluginWidget; #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.h #ifdef PLUGIN_SCHEDULE_TIMER PluginTimerList m_timerList; #endif -#if (PLATFORM(QT) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) -======= #if ((PLATFORM(QT) || PLATFORM(WX)) && PLATFORM(WIN_OS)) || defined(XP_MACOSX) ->>>>>>> webkit.org at r51976:WebCore/plugins/PluginView.h // On Mac OSX and Qt/Windows the plugin does not have its own native widget, // but is using the containing window as its reference for positioning/painting. PlatformPluginWidget m_window; diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp index 204a0c3..4d60569 100644 --- a/WebCore/rendering/RenderBlock.cpp +++ b/WebCore/rendering/RenderBlock.cpp @@ -162,23 +162,9 @@ RenderBlock::~RenderBlock() void RenderBlock::destroy() { -<<<<<<< HEAD:WebCore/rendering/RenderBlock.cpp - // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will - // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise. - children()->destroyLeftoverChildren(); - - // Destroy our continuation before anything other than anonymous children. - // The reason we don't destroy it before anonymous children is that they may - // have continuations of their own that are anonymous children of our continuation. - if (m_inlineContinuation) { - m_inlineContinuation->destroy(); - m_inlineContinuation = 0; - } -======= // Make sure to destroy anonymous children first while they are still connected to the rest of the tree, so that they will // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise. children()->destroyLeftoverChildren(); ->>>>>>> webkit.org at r51976:WebCore/rendering/RenderBlock.cpp // Destroy our continuation before anything other than anonymous children. // The reason we don't destroy it before anonymous children is that they may diff --git a/WebCore/rendering/RenderInline.cpp b/WebCore/rendering/RenderInline.cpp index 6df5ffe..2f9a247 100644 --- a/WebCore/rendering/RenderInline.cpp +++ b/WebCore/rendering/RenderInline.cpp @@ -56,16 +56,6 @@ void RenderInline::destroy() // properly dirty line boxes that they are removed from. Effects that do :before/:after only on hover could crash otherwise. children()->destroyLeftoverChildren(); -<<<<<<< HEAD:WebCore/rendering/RenderInline.cpp - // Destroy our continuation before anything other than anonymous children. - // The reason we don't destroy it before anonymous children is that they may - // have continuations of their own that are anonymous children of our continuation. - if (m_continuation) { - m_continuation->destroy(); - m_continuation = 0; - } - -======= // Destroy our continuation before anything other than anonymous children. // The reason we don't destroy it before anonymous children is that they may // have continuations of their own that are anonymous children of our continuation. @@ -74,7 +64,6 @@ void RenderInline::destroy() m_continuation = 0; } ->>>>>>> webkit.org at r51976:WebCore/rendering/RenderInline.cpp if (!documentBeingDestroyed()) { if (firstLineBox()) { // We can't wait for RenderBoxModelObject::destroy to clear the selection, diff --git a/WebCore/rendering/RenderLayer.cpp b/WebCore/rendering/RenderLayer.cpp index ee7814c..7e0fee9 100644 --- a/WebCore/rendering/RenderLayer.cpp +++ b/WebCore/rendering/RenderLayer.cpp @@ -2182,12 +2182,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, GraphicsContext* p, #else TransformationMatrix transform; transform.translate(x, y); -<<<<<<< HEAD:WebCore/rendering/RenderLayer.cpp - transform = *m_transform * transform; -#endif -======= transform = layerTransform * transform; ->>>>>>> webkit.org at r51976:WebCore/rendering/RenderLayer.cpp +#endif // Apply the transform. p->save(); diff --git a/WebCore/rendering/RenderWidget.cpp b/WebCore/rendering/RenderWidget.cpp index 33f03e2..8b7e899 100644 --- a/WebCore/rendering/RenderWidget.cpp +++ b/WebCore/rendering/RenderWidget.cpp @@ -305,21 +305,9 @@ void RenderWidget::updateWidgetPosition() int w = width() - borderLeft() - borderRight() - paddingLeft() - paddingRight(); int h = height() - borderTop() - borderBottom() - paddingTop() - paddingBottom(); -<<<<<<< HEAD:WebCore/rendering/RenderWidget.cpp - IntRect newBounds(absPos.x(), absPos.y(), w, h); - IntRect oldBounds(m_widget->frameRect()); - bool boundsChanged = newBounds != oldBounds; - if (boundsChanged) { - RenderWidgetProtector protector(this); - RefPtr<Node> protectedNode(node()); - m_widget->setFrameRect(newBounds); - } - -#ifndef FLATTEN_IFRAME -======= bool boundsChanged = setWidgetGeometry(IntRect(absPos.x(), absPos.y(), w, h)); ->>>>>>> webkit.org at r51976:WebCore/rendering/RenderWidget.cpp +#ifndef FLATTEN_IFRAME // if the frame bounds got changed, or if view needs layout (possibly indicating // content size is wrong) we have to do a layout to set the right widget size if (m_widget->isFrameView()) { |