[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dbates at webkit.org
dbates at webkit.org
Wed Dec 22 11:14:14 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 0c6c8b0680b606d0dc5b4299eac6cc38377972de
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 19:18:26 2010 +0000
2010-07-15 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
[Mac] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37929
Implements support for markerTextForListItem in the Mac port.
* DOM/WebDOMOperations.mm:
(+[DOMElement _DOMElementFromJSContext]): Added.
(-[DOMElement _markerTextForListItem]): Added.
* DOM/WebDOMOperationsPrivate.h:
2010-07-15 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
[Mac] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37929
Export symbols for WebCore::markerTextForListItem() and WebCore::toElement().
* WebCore.exp.in:
2010-07-15 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
[Mac] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37929
Remove skipped layout tests now that we have DRT support.
* platform/mac/Skipped:
2010-07-15 Daniel Bates <dbates at rim.com>
Reviewed by Darin Adler.
[Mac] Implement LayoutTestController::markerTextForListItem()
https://bugs.webkit.org/show_bug.cgi?id=37929
Implements DRT support for markerTextForListItem in the Mac port.
* DumpRenderTree/mac/LayoutTestControllerMac.mm:
(LayoutTestController::markerTextForListItem): Implemented.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63445 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c66f5a6..5318a34 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-15 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ [Mac] Implement LayoutTestController::markerTextForListItem()
+ https://bugs.webkit.org/show_bug.cgi?id=37929
+
+ Remove skipped layout tests now that we have DRT support.
+
+ * platform/mac/Skipped:
+
2010-07-15 Kenneth Russell <kbr at google.com>
Reviewed by Nate Chapin.
diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 3edf261..aabdad3 100644
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -156,14 +156,6 @@ fast/overflow/scrollbar-restored-and-then-locked.html
editing/pasteboard/onpaste-text-html.html
fast/events/ondrop-text-html.html
-# Missing an implementation of LayoutTestController::markerTextForListItem()
-fast/lists/ol-nested-items-dynamic-insert.html
-fast/lists/ol-nested-items-dynamic-remove.html
-fast/lists/ol-nested-items.html
-fast/lists/ol-nested-list-dynamic-insert.html
-fast/lists/ol-nested-list-dynamic-remove.html
-fast/lists/ol-nested-list.html
-
# https://bugs.webkit.org/show_bug.cgi?id=33812
fast/dom/icon-url-property.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6bfc3b4..15dd5b3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-15 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ [Mac] Implement LayoutTestController::markerTextForListItem()
+ https://bugs.webkit.org/show_bug.cgi?id=37929
+
+ Export symbols for WebCore::markerTextForListItem() and WebCore::toElement().
+
+ * WebCore.exp.in:
+
2010-07-15 Andreas Kling <andreas.kling at nokia.com>
Rubber-stamped by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.exp.in b/WebCore/WebCore.exp.in
index 3cdfb00..9929a8c 100644
--- a/WebCore/WebCore.exp.in
+++ b/WebCore/WebCore.exp.in
@@ -423,6 +423,7 @@ __ZN7WebCore20RenderEmbeddedObject30setShowsCrashedPluginIndicatorEv
__ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx
__ZN7WebCore20ResourceResponseBaseC2Ev
__ZN7WebCore20protocolIsJavaScriptERKNS_6StringE
+__ZN7WebCore21markerTextForListItemEPNS_7ElementE
__ZN7WebCore21PlatformKeyboardEvent24disambiguateKeyDownEventENS0_4TypeEb
__ZN7WebCore21PlatformKeyboardEventC1EP7NSEvent
__ZN7WebCore21SVGDocumentExtensions21sampleAnimationAtTimeERKNS_6StringEPNS_14SVGSMILElementEd
@@ -776,6 +777,7 @@ __ZN7WebCore9TimerBase4stopEv
__ZN7WebCore9TimerBase5startEdd
__ZN7WebCore9TimerBaseC2Ev
__ZN7WebCore9TimerBaseD2Ev
+__ZN7WebCore9toElementEN3JSC7JSValueE
__ZN7WebCore9fontCacheEv
__ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
__ZN7WebCore9pageCacheEv
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 119ce6d..c2f1a74 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-15 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ [Mac] Implement LayoutTestController::markerTextForListItem()
+ https://bugs.webkit.org/show_bug.cgi?id=37929
+
+ Implements support for markerTextForListItem in the Mac port.
+
+ * DOM/WebDOMOperations.mm:
+ (+[DOMElement _DOMElementFromJSContext]): Added.
+ (-[DOMElement _markerTextForListItem]): Added.
+ * DOM/WebDOMOperationsPrivate.h:
+
2010-07-14 Simon Fraser <simon.fraser at apple.com>
Fix non-ACCELERATED_COMPOSITING build.
diff --git a/WebKit/mac/DOM/WebDOMOperations.mm b/WebKit/mac/DOM/WebDOMOperations.mm
index 194a000..d21f2b0 100644
--- a/WebKit/mac/DOM/WebDOMOperations.mm
+++ b/WebKit/mac/DOM/WebDOMOperations.mm
@@ -29,6 +29,7 @@
#import "WebDOMOperationsPrivate.h"
#import "DOMDocumentInternal.h"
+#import "DOMElementInternal.h"
#import "DOMNodeInternal.h"
#import "DOMRangeInternal.h"
#import "WebArchiveInternal.h"
@@ -36,15 +37,42 @@
#import "WebFrameInternal.h"
#import "WebFramePrivate.h"
#import "WebKitNSStringExtras.h"
+#import <JavaScriptCore/APICast.h>
#import <WebCore/CSSHelper.h>
#import <WebCore/Document.h>
+#import <WebCore/JSElement.h>
#import <WebCore/LegacyWebArchive.h>
#import <WebCore/markup.h>
+#import <WebCore/RenderTreeAsText.h>
#import <WebKit/DOMExtensions.h>
#import <WebKit/DOMHTML.h>
+#import <runtime/JSLock.h>
+#import <runtime/JSValue.h>
#import <wtf/Assertions.h>
using namespace WebCore;
+using namespace JSC;
+
+ at implementation DOMElement (WebDOMElementOperationsPrivate)
+
++ (DOMElement *)_DOMElementFromJSContext:(JSContextRef)context value:(JSValueRef)value
+{
+ if (!context)
+ return 0;
+
+ if (!value)
+ return 0;
+
+ JSLock lock(SilenceAssertionsOnly);
+ return kit(toElement(toJS(toJS(context), value)));
+}
+
+- (NSString *)_markerTextForListItem
+{
+ return WebCore::markerTextForListItem(core(self));
+}
+
+ at end
@implementation DOMNode (WebDOMNodeOperations)
diff --git a/WebKit/mac/DOM/WebDOMOperationsPrivate.h b/WebKit/mac/DOM/WebDOMOperationsPrivate.h
index 826aa7d..1c22e82 100644
--- a/WebKit/mac/DOM/WebDOMOperationsPrivate.h
+++ b/WebKit/mac/DOM/WebDOMOperationsPrivate.h
@@ -27,6 +27,12 @@
*/
#import <WebKit/WebDOMOperations.h>
+#import <JavaScriptCore/JSBase.h>
+
+ at interface DOMElement (WebDOMElementOperationsPrivate)
++ (DOMElement *)_DOMElementFromJSContext:(JSContextRef)context value:(JSValueRef)value;
+- (NSString *)_markerTextForListItem;
+ at end
@interface DOMDocument (WebDOMDocumentOperationsPrivate)
- (NSArray *)_focusableNodes;
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3e77e4f..36063ac 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15 Daniel Bates <dbates at rim.com>
+
+ Reviewed by Darin Adler.
+
+ [Mac] Implement LayoutTestController::markerTextForListItem()
+ https://bugs.webkit.org/show_bug.cgi?id=37929
+
+ Implements DRT support for markerTextForListItem in the Mac port.
+
+ * DumpRenderTree/mac/LayoutTestControllerMac.mm:
+ (LayoutTestController::markerTextForListItem): Implemented.
+
2010-07-15 Adam Barth <abarth at webkit.org>
Unreviewed.
diff --git a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
index aec4c19..6b921f0 100644
--- a/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
+++ b/WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm
@@ -46,6 +46,7 @@
#import <WebKit/WebCoreStatistics.h>
#import <WebKit/WebDataSource.h>
#import <WebKit/WebDatabaseManagerPrivate.h>
+#import <WebKit/WebDOMOperationsPrivate.h>
#import <WebKit/WebFrame.h>
#import <WebKit/WebFrameViewPrivate.h>
#import <WebKit/WebGeolocationPosition.h>
@@ -196,8 +197,12 @@ JSRetainPtr<JSStringRef> LayoutTestController::layerTreeAsText() const
JSRetainPtr<JSStringRef> LayoutTestController::markerTextForListItem(JSContextRef context, JSValueRef nodeObject) const
{
- // FIXME: Implement me.
- return JSRetainPtr<JSStringRef>();
+ DOMElement *element = [DOMElement _DOMElementFromJSContext:context value:nodeObject];
+ if (!element)
+ return JSRetainPtr<JSStringRef>();
+
+ JSRetainPtr<JSStringRef> markerText(Adopt, JSStringCreateWithCFString((CFStringRef)[element _markerTextForListItem]));
+ return markerText;
}
int LayoutTestController::pageNumberForElementById(JSStringRef id, float pageWidthInPixels, float pageHeightInPixels)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list