[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hamaji at chromium.org
hamaji at chromium.org
Wed Apr 7 23:36:52 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit e6331aa68eca265a1537d08236f2edd037332ded
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 13 02:37:09 2009 +0000
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
externalRepresentation should take Frame as the argument
https://bugs.webkit.org/show_bug.cgi?id=31393
No new tests as this is just a refactoring.
* WebCore.base.exp:
* rendering/RenderTreeAsText.cpp:
(WebCore::externalRepresentation):
* rendering/RenderTreeAsText.h:
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
externalRepresentation should take Frame as the argument
https://bugs.webkit.org/show_bug.cgi?id=31393
No new tests as this is just a refactoring.
* webkit/webkitwebframe.cpp:
(webkit_web_frame_dump_render_tree):
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
externalRepresentation should take Frame as the argument
https://bugs.webkit.org/show_bug.cgi?id=31393
No new tests as this is just a refactoring.
* Misc/WebCoreStatistics.mm:
(-[WebFrame renderTreeAsExternalRepresentation]):
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
externalRepresentation should take Frame as the argument
https://bugs.webkit.org/show_bug.cgi?id=31393
No new tests as this is just a refactoring.
* Api/qwebframe.cpp:
(QWebFrame::renderTreeDump):
2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
Reviewed by Darin Adler.
externalRepresentation should take Frame as the argument
https://bugs.webkit.org/show_bug.cgi?id=31393
No new tests as this is just a refactoring.
* WebFrame.cpp:
(WebFrame::renderTreeAsExternalRepresentation):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c017ac9..c337832 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ externalRepresentation should take Frame as the argument
+ https://bugs.webkit.org/show_bug.cgi?id=31393
+
+ No new tests as this is just a refactoring.
+
+ * WebCore.base.exp:
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::externalRepresentation):
+ * rendering/RenderTreeAsText.h:
+
2009-11-12 Ben Murdoch <benm at google.com>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/WebCore.base.exp b/WebCore/WebCore.base.exp
index 90516c1..5fcbec4 100644
--- a/WebCore/WebCore.base.exp
+++ b/WebCore/WebCore.base.exp
@@ -427,7 +427,7 @@ __ZN7WebCore22ScriptExecutionContext26canSuspendActiveDOMObjectsEv
__ZN7WebCore22applicationIsAppleMailEv
__ZN7WebCore22counterValueForElementEPNS_7ElementE
__ZN7WebCore22createFragmentFromTextEPNS_5RangeERKNS_6StringE
-__ZN7WebCore22externalRepresentationEPNS_12RenderObjectE
+__ZN7WebCore22externalRepresentationEPNS_5FrameE
__ZN7WebCore23ApplicationCacheStorage14setMaximumSizeEx
__ZN7WebCore23ApplicationCacheStorage16storeCopyOfCacheERKNS_6StringEPNS_20ApplicationCacheHostE
__ZN7WebCore23ApplicationCacheStorage17setCacheDirectoryERKNS_6StringE
diff --git a/WebCore/rendering/RenderTreeAsText.cpp b/WebCore/rendering/RenderTreeAsText.cpp
index 120deb4..af0d825 100644
--- a/WebCore/rendering/RenderTreeAsText.cpp
+++ b/WebCore/rendering/RenderTreeAsText.cpp
@@ -539,8 +539,9 @@ static void writeSelection(TextStream& ts, const RenderObject* o)
<< "selection end: position " << selection.end().deprecatedEditingOffset() << " of " << nodePosition(selection.end().node()) << "\n";
}
-String externalRepresentation(RenderObject* o)
+String externalRepresentation(Frame* frame)
{
+ RenderObject* o = frame->contentRenderer();
if (!o)
return String();
diff --git a/WebCore/rendering/RenderTreeAsText.h b/WebCore/rendering/RenderTreeAsText.h
index 325f109..b00f7c9 100644
--- a/WebCore/rendering/RenderTreeAsText.h
+++ b/WebCore/rendering/RenderTreeAsText.h
@@ -29,11 +29,12 @@
namespace WebCore {
class Element;
+class Frame;
class RenderObject;
class String;
class TextStream;
-String externalRepresentation(RenderObject*);
+String externalRepresentation(Frame*);
void write(TextStream&, const RenderObject&, int indent = 0);
// Helper function shared with SVGRenderTreeAsText
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 791c342..7ae2797 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ externalRepresentation should take Frame as the argument
+ https://bugs.webkit.org/show_bug.cgi?id=31393
+
+ No new tests as this is just a refactoring.
+
+ * webkit/webkitwebframe.cpp:
+ (webkit_web_frame_dump_render_tree):
+
2009-11-11 Gustavo Noronha Silva <gustavo.noronha at collabora.co.uk>
Reviewed by Holger Freyther.
diff --git a/WebKit/gtk/webkit/webkitwebframe.cpp b/WebKit/gtk/webkit/webkitwebframe.cpp
index 843f923..331e5e8 100644
--- a/WebKit/gtk/webkit/webkitwebframe.cpp
+++ b/WebKit/gtk/webkit/webkitwebframe.cpp
@@ -794,7 +794,7 @@ gchar* webkit_web_frame_dump_render_tree(WebKitWebFrame* frame)
if (view && view->layoutPending())
view->layout();
- String string = externalRepresentation(coreFrame->contentRenderer());
+ String string = externalRepresentation(coreFrame);
return g_strdup(string.utf8().data());
}
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index a68a4ff..831a55a 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ externalRepresentation should take Frame as the argument
+ https://bugs.webkit.org/show_bug.cgi?id=31393
+
+ No new tests as this is just a refactoring.
+
+ * Misc/WebCoreStatistics.mm:
+ (-[WebFrame renderTreeAsExternalRepresentation]):
+
2009-11-12 Adam Roben <aroben at apple.com>
Replace worldIDs with world objects
diff --git a/WebKit/mac/Misc/WebCoreStatistics.mm b/WebKit/mac/Misc/WebCoreStatistics.mm
index 6bac46e..f204ddb 100644
--- a/WebKit/mac/Misc/WebCoreStatistics.mm
+++ b/WebKit/mac/Misc/WebCoreStatistics.mm
@@ -242,7 +242,7 @@ using namespace WebCore;
- (NSString *)renderTreeAsExternalRepresentation
{
- return externalRepresentation(_private->coreFrame->contentRenderer());
+ return externalRepresentation(_private->coreFrame);
}
- (NSString *)counterValueForElement:(DOMElement*)element
diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index c85de6b..4c7c4fc 100644
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -490,7 +490,7 @@ QString QWebFrame::renderTreeDump() const
if (d->frame->view() && d->frame->view()->layoutPending())
d->frame->view()->layout();
- return externalRepresentation(d->frame->contentRenderer());
+ return externalRepresentation(d->frame);
}
/*!
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 4ff9f22..7cf9958 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ externalRepresentation should take Frame as the argument
+ https://bugs.webkit.org/show_bug.cgi?id=31393
+
+ No new tests as this is just a refactoring.
+
+ * Api/qwebframe.cpp:
+ (QWebFrame::renderTreeDump):
+
2009-11-12 Antonio Gomes <tonikitoo at webkit.org>
Reviewed by Jan Alonzo.
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index a7c29e0..2e671a8 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-12 Shinichiro Hamaji <hamaji at chromium.org>
+
+ Reviewed by Darin Adler.
+
+ externalRepresentation should take Frame as the argument
+ https://bugs.webkit.org/show_bug.cgi?id=31393
+
+ No new tests as this is just a refactoring.
+
+ * WebFrame.cpp:
+ (WebFrame::renderTreeAsExternalRepresentation):
+
2009-11-12 Adam Roben <aroben at apple.com>
Replace worldIDs with world objects
diff --git a/WebKit/win/WebFrame.cpp b/WebKit/win/WebFrame.cpp
index 4f9c353..86705e1 100644
--- a/WebKit/win/WebFrame.cpp
+++ b/WebKit/win/WebFrame.cpp
@@ -824,7 +824,7 @@ HRESULT STDMETHODCALLTYPE WebFrame::renderTreeAsExternalRepresentation(
if (!coreFrame)
return E_FAIL;
- *result = BString(externalRepresentation(coreFrame->contentRenderer())).release();
+ *result = BString(externalRepresentation(coreFrame)).release();
return S_OK;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list