AI 145796: Land the WebKit merge @r42026.

Automated import of CL 145796

4 files changed, 9 insertions, 33 deletions

diff --git a/WebCore/bindings/objc/DOM.mm b/WebCore/bindings/objc/DOM.mm
index 485d011..53be4ff 100644
--- a/WebCore/bindings/objc/DOM.mm
+++ b/WebCore/bindings/objc/DOM.mm
@@ -31,6 +31,7 @@
 #import "DOMHTMLCanvasElement.h"
 #import "DOMInternal.h"
 #import "ExceptionHandlers.h"
+#import "Frame.h"
 #import "HTMLNames.h"
 #import "HTMLPlugInElement.h"
 #import "NodeIterator.h"
@@ -400,7 +401,7 @@ static NSArray *kit(const Vector<IntRect>& rects)
     WebCore::RenderObject *renderer = [self _node]->renderer();
     if (renderer) {
         Vector<WebCore::IntRect> rects;
-        renderer->addLineBoxRects(rects);
+        renderer->absoluteRectsForRange(rects);
         return kit(rects);
     }
     return nil;
@@ -524,18 +525,6 @@ static NSArray *kit(const Vector<IntRect>& rects)
     return nil;
 }
 
-- (NSRect)_windowClipRect
-{
-    WebCore::RenderObject* renderer = [self _element]->renderer();
-    if (renderer && renderer->view()) {
-        WebCore::FrameView* frameView = renderer->view()->frameView();
-        if (!frameView)
-            return WebCore::IntRect();
-        return frameView->windowClipRectForLayer(renderer->enclosingLayer(), true);
-    }
-    return WebCore::IntRect();
-}
-
 // FIXME: this should be implemented in the implementation
 - (NSURL *)_getURLAttribute:(NSString *)name
 {
@@ -546,17 +535,6 @@ static NSArray *kit(const Vector<IntRect>& rects)
 }
 
 // FIXME: this should be implemented in the implementation
-- (void *)_NPObject
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
-    WebCore::Element* element = [self _element];
-    if (element->hasTagName(WebCore::HTMLNames::appletTag) || element->hasTagName(WebCore::HTMLNames::embedTag) || element->hasTagName(WebCore::HTMLNames::objectTag))
-        return static_cast<WebCore::HTMLPlugInElement*>(element)->getNPObject();
-#endif
-    return 0;
-}
-
-// FIXME: this should be implemented in the implementation
 - (BOOL)isFocused
 {
     WebCore::Element* impl = [self _element];
diff --git a/WebCore/bindings/objc/DOMAbstractView.mm b/WebCore/bindings/objc/DOMAbstractView.mm
index 728a39a..7bfe7f1 100644
--- a/WebCore/bindings/objc/DOMAbstractView.mm
+++ b/WebCore/bindings/objc/DOMAbstractView.mm
@@ -44,7 +44,7 @@
 
 - (void)dealloc
 {
-    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheck(); }
+    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); }
     [super dealloc];
 }
 
@@ -79,7 +79,7 @@
 
 - (id)_initWithFrame:(WebCore::Frame *)impl
 {
-    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheck(); };
+    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
     [super _init];
     _internal = reinterpret_cast<DOMObjectInternal*>(impl);
     WebCore::addDOMWrapper(self, impl);
@@ -88,7 +88,7 @@
 
 + (DOMAbstractView *)_wrapAbstractView:(WebCore::DOMWindow *)impl
 {
-    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheck(); };
+    { DOM_ASSERT_MAIN_THREAD(); WebCoreThreadViolationCheckRoundOne(); };
 
     if (!impl)
         return nil;
diff --git a/WebCore/bindings/objc/DOMPrivate.h b/WebCore/bindings/objc/DOMPrivate.h
index 0ee5979..ba95ce3 100644
--- a/WebCore/bindings/objc/DOMPrivate.h
+++ b/WebCore/bindings/objc/DOMPrivate.h
@@ -86,8 +86,6 @@
 - (NSFont *)_font;
 - (NSData *)_imageTIFFRepresentation;
 - (NSURL *)_getURLAttribute:(NSString *)name;
-- (void *)_NPObject; // For subclasses to implement; we only allow NPObjects to be created for certain element types
-- (NSRect)_windowClipRect; // Clip rect in NSWindow coords (used by plugins)
 - (BOOL)isFocused;
 @end
 
diff --git a/WebCore/bindings/objc/WebScriptObject.mm b/WebCore/bindings/objc/WebScriptObject.mm
index f08d61b..3cdae86 100644
--- a/WebCore/bindings/objc/WebScriptObject.mm
+++ b/WebCore/bindings/objc/WebScriptObject.mm
@@ -298,9 +298,9 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root
     if (![self _isSafeScript])
         return nil;
 
-    [self _rootObject]->globalObject()->startTimeoutCheck();
+    [self _rootObject]->globalObject()->globalData()->timeoutChecker.start();
     JSValuePtr result = call(exec, function, callType, callData, [self _imp], argList);
-    [self _rootObject]->globalObject()->stopTimeoutCheck();
+    [self _rootObject]->globalObject()->globalData()->timeoutChecker.stop();
 
     if (exec->hadException()) {
         addExceptionToConsole(exec);
@@ -327,9 +327,9 @@ static void getListFromNSArray(ExecState *exec, NSArray *array, RootObject* root
     JSValuePtr result;
     JSLock lock(false);
     
-    [self _rootObject]->globalObject()->startTimeoutCheck();
+    [self _rootObject]->globalObject()->globalData()->timeoutChecker.start();
     Completion completion = JSC::evaluate([self _rootObject]->globalObject()->globalExec(), [self _rootObject]->globalObject()->globalScopeChain(), makeSource(String(script)));
-    [self _rootObject]->globalObject()->stopTimeoutCheck();
+    [self _rootObject]->globalObject()->globalData()->timeoutChecker.stop();
     ComplType type = completion.complType();
     
     if (type == Normal) {