[webkit-changes] [112643] branches/safari-534.56-branch/Source/WebCore
Title: [112643] branches/safari-534.56-branch/Source/WebCore Revision 112643 Author bda...@apple.com Date 2012-03-29 21:43:59 -0700 (Thu, 29 Mar 2012) Log Message Branch: Shadow inside text field is blurry/blocky in HiDPI Reviewed by Dan Bernstein. This patch merges the following changes to the branch: http://trac.webkit.org/changeset/97032 http://trac.webkit.org/changeset/98520 This patch also adds branch-specific code that makes it so the regression tracked by only affects the branch in HiDPI mode. Essentially, this is a workaround for . With this workaround, when the deviceScaleFactor is 1, we have an old-school gradient bezel in text fields whether they are styled or not. This is good and matches shipping Safari. When the deviceScaleFactor is greater than 1, text fields will have newer, AppKit-matching gradients that look much more appropriate at the higher resolutions. However, if the text field is styled in any way, we'll revert to the old-school bezel, which doesn't look great in HiDPI, but it looks better than the CSS border, which is the only alternative until 11150452 is resolved. This is the merging of the changes listed above. * platform/mac/ThemeMac.mm: (WebCore::ThemeMac::ensuredView): * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::paintSliderThumb): isControlStyled() should treat text fields like it used to in order to avoid the regression tracked by 5221. * rendering/RenderThemeMac.h: * rendering/RenderThemeMac.mm: (WebCore::RenderThemeMac::isControlStyled): Use the old gradient always unless we are an unstyled text field in HiDPI. (WebCore::RenderThemeMac::paintTextField): (WebCore::RenderThemeMac::textField): Modified Paths branches/safari-534.56-branch/Source/WebCore/ChangeLog branches/safari-534.56-branch/Source/WebCore/platform/mac/ThemeMac.mm branches/safari-534.56-branch/Source/WebCore/rendering/RenderThemeMac.h branches/safari-534.56-branch/Source/WebCore/rendering/RenderThemeMac.mm Diff Modified: branches/safari-534.56-branch/Source/WebCore/ChangeLog (112642 => 112643) --- branches/safari-534.56-branch/Source/WebCore/ChangeLog 2012-03-30 03:44:14 UTC (rev 112642) +++ branches/safari-534.56-branch/Source/WebCore/ChangeLog 2012-03-30 04:43:59 UTC (rev 112643) @@ -1,3 +1,42 @@ +2012-03-29 Beth Dakin + +Reviewed by Dan Bernstein. + + Branch: Shadow inside text field is blurry/blocky in +HiDPI + +This patch merges the following changes to the branch: +http://trac.webkit.org/changeset/97032 +http://trac.webkit.org/changeset/98520 + +This patch also adds branch-specific code that makes it so the regression tracked +by only affects the branch in HiDPI mode. + +Essentially, this is a workaround for . With this +workaround, when the deviceScaleFactor is 1, we have an old-school gradient bezel +in text fields whether they are styled or not. This is good and matches shipping +Safari. When the deviceScaleFactor is greater than 1, text fields will have newer, +AppKit-matching gradients that look much more appropriate at the higher +resolutions. However, if the text field is styled in any way, we'll revert to the +old-school bezel, which doesn't look great in HiDPI, but it looks better than the +CSS border, which is the only alternative until 11150452 is resolved. + +This is the merging of the changes listed above. +* platform/mac/ThemeMac.mm: +(WebCore::ThemeMac::ensuredView): +* rendering/RenderThemeMac.mm: +(WebCore::RenderThemeMac::paintSliderThumb): + +isControlStyled() should treat text fields like it used to in order to avoid the +regression tracked by 5221. +* rendering/RenderThemeMac.h: +* rendering/RenderThemeMac.mm: +(WebCore::RenderThemeMac::isControlStyled): + +Use the old gradient always unless we are an unstyled text field in HiDPI. +(WebCore::RenderThemeMac::paintTextField): +(WebCore::RenderThemeMac::textField): + 2012-03-16 Lucas Forschler Merge 107102 Modified: branches/safari-534.56-branch/Source/WebCore/platform/mac/ThemeMac.mm (112642 => 112643) --- branches/safari-534.56-branch/Source/WebCore/platform/mac/ThemeMac.mm 2012-03-30 03:44:14 UTC (rev 112642) +++ branches/safari-534.56-branch/Source/WebCore/platform/mac/ThemeMac.mm 2012-03-30 04:43:59 UTC (rev 112643) @@ -37,7 +37,7 @@ using namespace std; // This is a view whose sole purpose is to tell AppKit that it's flipped. -@interface WebCoreFlippedView : NSView +@interface WebCoreFlippedView : NSControl @end @implementation WebCoreFlippedView @@ -556,6 +556,7 @@ // Use a fake flipped view. static NSView *flippedView = [[WebCoreFlippedView alloc] init]; +[flippedView setFrameSize:scrollView->contentsSize()]; return flippedView; } Modified: branches/safari-534.56-branch/
[webkit-changes] [112642] trunk/Source/WebCore
Title: [112642] trunk/Source/WebCore Revision 112642 Author commit-qu...@webkit.org Date 2012-03-29 20:44:14 -0700 (Thu, 29 Mar 2012) Log Message Vertical flow support for OpenType fonts with the least platform dependencies https://bugs.webkit.org/show_bug.cgi?id=81326 Patch by Koji Ishii on 2012-03-29 Reviewed by Dan Bernstein. This patch introduces a new class OpenTypeVerticalData to read vertical font metrics from OpenType fonts. Currently, WebKit relies on platform APIs to do the work. However, some platforms such as Windows lack support for all the capabilities WebKit requires for vertical flow and the text-orientation property to work correctly. Reading OpenType tables directly also gives benefits in consistent behavior among the WebKit platforms. This patch is for any platforms that want to parse OpenType tables directly, but it's currently included only in CGWin and isn't on any code path even on CGWin yet. Caller's side change for CGWin and support for other platforms will be in separate bugs. No new tests are required. No behavior changes. * WebCore.vcproj/WebCore.vcproj: Added OpenTypeTypes.h and OpenTypeVerticalData.h/cpp. * platform/SharedBuffer.cpp: Add create(size_t) (WebCore::SharedBuffer::SharedBuffer): (WebCore): * platform/SharedBuffer.h: Add create(size_t) (WebCore::SharedBuffer::create): (SharedBuffer): * platform/graphics/FontPlatformData.h: Added openTypeTable(). (WebCore): (FontPlatformData): * platform/graphics/SimpleFontData.h: Added sizePerUnit(). (WebCore::SimpleFontData::sizePerUnit): size() / unitsPerEm() for less multiplication. * platform/graphics/opentype/OpenTypeTypes.h: Added OpenType basic type definitions. (OpenType): (WebCore::OpenType::BigEndianShort::operator short): (WebCore::OpenType::BigEndianShort::BigEndianShort): (BigEndianShort): (WebCore::OpenType::BigEndianUShort::operator unsigned short): (WebCore::OpenType::BigEndianUShort::BigEndianUShort): (BigEndianUShort): (WebCore::OpenType::BigEndianLong::operator int): (WebCore::OpenType::BigEndianLong::BigEndianLong): (BigEndianLong): (WebCore::OpenType::BigEndianULong::operator unsigned): (WebCore::OpenType::BigEndianULong::BigEndianULong): (BigEndianULong): * platform/graphics/opentype/OpenTypeVerticalData.cpp: Added. (OpenType): (HheaTable): (VheaTable): (Entry): (VORGTable): (VertOriginYMetrics): (WebCore::OpenType::VORGTable::requiredSize): (WebCore): (WebCore::validatedPtr): (WebCore::OpenTypeVerticalData::OpenTypeVerticalData): (WebCore::OpenTypeVerticalData::advanceHeight): Advance height for a glyph. (WebCore::OpenTypeVerticalData::getVerticalTranslationsForGlyphs): Vertical origin. * platform/graphics/opentype/OpenTypeVerticalData.h: Added. (WebCore): (OpenTypeVerticalData): A new class to handle vertical flow data in OpenType. (WebCore::OpenTypeVerticalData::isOpenType): (WebCore::OpenTypeVerticalData::hasVerticalMetrics): (WebCore::OpenTypeVerticalData::hasVORG): * platform/graphics/win/FontPlatformDataWin.cpp: (WebCore): (WebCore::FontPlatformData::openTypeTable): Implemented openTypeTable() for Win32. Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj trunk/Source/WebCore/platform/SharedBuffer.cpp trunk/Source/WebCore/platform/SharedBuffer.h trunk/Source/WebCore/platform/graphics/FontPlatformData.h trunk/Source/WebCore/platform/graphics/SimpleFontData.h trunk/Source/WebCore/platform/graphics/win/FontPlatformDataWin.cpp Added Paths trunk/Source/WebCore/platform/graphics/opentype/OpenTypeTypes.h trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.cpp trunk/Source/WebCore/platform/graphics/opentype/OpenTypeVerticalData.h Diff Modified: trunk/Source/WebCore/ChangeLog (112641 => 112642) --- trunk/Source/WebCore/ChangeLog 2012-03-30 03:31:45 UTC (rev 112641) +++ trunk/Source/WebCore/ChangeLog 2012-03-30 03:44:14 UTC (rev 112642) @@ -1,3 +1,76 @@ +2012-03-29 Koji Ishii + + +Vertical flow support for OpenType fonts with the least platform dependencies +https://bugs.webkit.org/show_bug.cgi?id=81326 + +Reviewed by Dan Bernstein. + +This patch introduces a new class OpenTypeVerticalData to read +vertical font metrics from OpenType fonts. + +Currently, WebKit relies on platform APIs to do the work. However, +some platforms such as Windows lack support for all the capabilities +WebKit requires for vertical flow and the text-orientation property +to work correctly. Reading OpenType tables directly also gives +benefits in consistent behavior among the WebKit platforms. + +This patch is for any platforms that want to parse OpenType tables +directly, but it's currently included only in CGWin and isn't on any +code path even on CGWin yet. Caller's side change for CGWin and +support for other platforms will be in separate bugs. + +No new tests are required. No behavior changes. + +* WebCore.vcproj/WebC
[webkit-changes] [112641] trunk/Source/WebCore
Title: [112641] trunk/Source/WebCore
Revision 112641
Author leo.y...@torchmobile.com.cn
Date 2012-03-29 20:31:45 -0700 (Thu, 29 Mar 2012)
Log Message
[BlackBerry] Sync up PlatformMouseEvent
https://bugs.webkit.org/show_bug.cgi?id=82567
Reviewed by Rob Buis.
This patch is adding blackberry specific members to PlatformMouseEvent.
Also re-base PlatformMouseEventBlackBerry to adapt to the re-factor
of PlatformMouseEvent.
* platform/PlatformMouseEvent.h:
(PlatformMouseEvent): BlackBerry specific constructor.
(WebCore::PlatformMouseEvent::inputMethod): Input source of mouse event
for blackberry platform.
* platform/blackberry/PlatformMouseEventBlackBerry.cpp:
(WebCore::PlatformMouseEvent::PlatformMouseEvent): Re-base the constructor
to adapt the re-factor of PlatformMouseEvent.
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/platform/PlatformMouseEvent.h
trunk/Source/WebCore/platform/blackberry/PlatformMouseEventBlackBerry.cpp
Diff
Modified: trunk/Source/WebCore/ChangeLog (112640 => 112641)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 03:04:25 UTC (rev 112640)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 03:31:45 UTC (rev 112641)
@@ -1,5 +1,24 @@
2012-03-29 Leo Yang
+[BlackBerry] Sync up PlatformMouseEvent
+https://bugs.webkit.org/show_bug.cgi?id=82567
+
+Reviewed by Rob Buis.
+
+This patch is adding blackberry specific members to PlatformMouseEvent.
+Also re-base PlatformMouseEventBlackBerry to adapt to the re-factor
+of PlatformMouseEvent.
+
+* platform/PlatformMouseEvent.h:
+(PlatformMouseEvent): BlackBerry specific constructor.
+(WebCore::PlatformMouseEvent::inputMethod): Input source of mouse event
+for blackberry platform.
+* platform/blackberry/PlatformMouseEventBlackBerry.cpp:
+(WebCore::PlatformMouseEvent::PlatformMouseEvent): Re-base the constructor
+to adapt the re-factor of PlatformMouseEvent.
+
+2012-03-29 Leo Yang
+
[BlackBerry] Turn on STORE_FONT_CUSTOM_PLATFORM_DATA in CachedFont.cpp
https://bugs.webkit.org/show_bug.cgi?id=82573
Modified: trunk/Source/WebCore/platform/PlatformMouseEvent.h (112640 => 112641)
--- trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-03-30 03:04:25 UTC (rev 112640)
+++ trunk/Source/WebCore/platform/PlatformMouseEvent.h 2012-03-30 03:31:45 UTC (rev 112641)
@@ -55,6 +55,10 @@
// These button numbers match the ones used in the DOM API, 0 through 2, except for NoButton which isn't specified.
enum MouseButton { NoButton = -1, LeftButton, MiddleButton, RightButton };
+
+#if PLATFORM(BLACKBERRY)
+enum MouseInputMethod { PointingDevice, TouchScreen };
+#endif
class PlatformMouseEvent : public PlatformEvent {
public:
@@ -125,6 +129,10 @@
PlatformMouseEvent(const wxMouseEvent&, const wxPoint& globalPoint, int clickCount);
#endif
+#if PLATFORM(BLACKBERRY)
+PlatformMouseEvent(const IntPoint& eventPosition, const IntPoint& globalPosition, const PlatformEvent::Type, int clickCount, MouseButton, MouseInputMethod = PointingDevice);
+MouseInputMethod inputMethod() const { return m_inputMethod; }
+#endif
protected:
IntPoint m_position;
IntPoint m_globalPosition;
@@ -139,6 +147,8 @@
int m_eventNumber;
#elif PLATFORM(WIN)
bool m_didActivateWebView;
+#elif PLATFORM(BLACKBERRY)
+MouseInputMethod m_inputMethod;
#endif
};
Modified: trunk/Source/WebCore/platform/blackberry/PlatformMouseEventBlackBerry.cpp (112640 => 112641)
--- trunk/Source/WebCore/platform/blackberry/PlatformMouseEventBlackBerry.cpp 2012-03-30 03:04:25 UTC (rev 112640)
+++ trunk/Source/WebCore/platform/blackberry/PlatformMouseEventBlackBerry.cpp 2012-03-30 03:31:45 UTC (rev 112641)
@@ -23,20 +23,15 @@
namespace WebCore {
-PlatformMouseEvent::PlatformMouseEvent(const IntPoint& eventPos, const IntPoint& globalPos, const MouseEventType type, int clickCount, MouseButton button, MouseInputMethod method)
-: m_position(eventPos)
-, m_globalPosition(globalPos)
+PlatformMouseEvent::PlatformMouseEvent(const IntPoint& eventPosition, const IntPoint& globalPosition, const PlatformEvent::Type type, int clickCount, MouseButton button, MouseInputMethod method)
+: PlatformEvent(type, false, false, false, false, currentTime())
+, m_position(eventPosition)
+, m_globalPosition(globalPosition)
, m_button(button)
-, m_eventType(type)
, m_clickCount(clickCount)
-, m_shiftKey(false)
-, m_ctrlKey(false)
-, m_altKey(false)
-, m_metaKey(false)
-, m_timestamp(currentTime())
, m_inputMethod(method)
{
-ASSERT(type != MouseEventScroll);
+ASSERT(type != MouseScroll);
}
} // namespace WebCore
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112640] trunk/Source/WebCore
Title: [112640] trunk/Source/WebCore Revision 112640 Author leo.y...@torchmobile.com.cn Date 2012-03-29 20:04:25 -0700 (Thu, 29 Mar 2012) Log Message [BlackBerry] Turn on STORE_FONT_CUSTOM_PLATFORM_DATA in CachedFont.cpp https://bugs.webkit.org/show_bug.cgi?id=82573 Reviewed by Rob Buis. Tests: covered by existing tests. * loader/cache/CachedFont.cpp: Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/loader/cache/CachedFont.cpp Diff Modified: trunk/Source/WebCore/ChangeLog (112639 => 112640) --- trunk/Source/WebCore/ChangeLog 2012-03-30 03:02:04 UTC (rev 112639) +++ trunk/Source/WebCore/ChangeLog 2012-03-30 03:04:25 UTC (rev 112640) @@ -1,3 +1,14 @@ +2012-03-29 Leo Yang + +[BlackBerry] Turn on STORE_FONT_CUSTOM_PLATFORM_DATA in CachedFont.cpp +https://bugs.webkit.org/show_bug.cgi?id=82573 + +Reviewed by Rob Buis. + +Tests: covered by existing tests. + +* loader/cache/CachedFont.cpp: + 2012-03-29 Adam Barth [Chromium] Attempt to fix the component build Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (112639 => 112640) --- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-30 03:02:04 UTC (rev 112639) +++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2012-03-30 03:04:25 UTC (rev 112640) @@ -28,7 +28,7 @@ #include "CachedFont.h" // FIXME: This should really be a blacklist instead of a whitelist -#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || OS(WINCE) +#if USE(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (!OS(DARWIN) || USE(SKIA_ON_MAC_CHROMIUM))) || OS(WINCE) || PLATFORM(BLACKBERRY) #define STORE_FONT_CUSTOM_PLATFORM_DATA #endif ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112639] trunk/Source/WebCore
Title: [112639] trunk/Source/WebCore
Revision 112639
Author aba...@webkit.org
Date 2012-03-29 20:02:04 -0700 (Thu, 29 Mar 2012)
Log Message
[Chromium] Attempt to fix the component build
https://bugs.webkit.org/show_bug.cgi?id=82676
Reviewed by Dirk Pranke.
Now that we're implementing some of the WEBKIT_EXPORT symbols in
WebCore/platform/chromium/support, we need to tell the build system
that we want to actually export these symbols.
* WebCore.gyp/WebCore.gyp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
Diff
Modified: trunk/Source/WebCore/ChangeLog (112638 => 112639)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 02:25:11 UTC (rev 112638)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 03:02:04 UTC (rev 112639)
@@ -1,5 +1,18 @@
2012-03-29 Adam Barth
+[Chromium] Attempt to fix the component build
+https://bugs.webkit.org/show_bug.cgi?id=82676
+
+Reviewed by Dirk Pranke.
+
+Now that we're implementing some of the WEBKIT_EXPORT symbols in
+WebCore/platform/chromium/support, we need to tell the build system
+that we want to actually export these symbols.
+
+* WebCore.gyp/WebCore.gyp:
+
+2012-03-29 Adam Barth
+
Unreviewed, rolling out r112572.
http://trac.webkit.org/changeset/112572
https://bugs.webkit.org/show_bug.cgi?id=82582
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (112638 => 112639)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 02:25:11 UTC (rev 112638)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 03:02:04 UTC (rev 112639)
@@ -1465,6 +1465,15 @@
['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
],
'conditions': [
+['inside_chromium_build==1', {
+'conditions': [
+['component=="shared_library"', {
+'defines': [
+'WEBKIT_DLL',
+],
+}],
+],
+}],
['use_x11 == 1', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112638] branches/chromium/1084/Source/WebKit/chromium/src/ WorkerFileSystemCallbacksBridge.cpp
Title: [112638] branches/chromium/1084/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp
Revision 112638
Author infe...@chromium.org
Date 2012-03-29 19:25:11 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112576 - [Chromium] WorkerFileSystemContextObserver can reference a deleted WorkerFileSystemCallbacksBridge.
BUG=120007
Review URL: https://chromiumcodereview.appspot.com/9939006
Modified Paths
branches/chromium/1084/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp
Diff
Modified: branches/chromium/1084/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp (112637 => 112638)
--- branches/chromium/1084/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2012-03-30 02:23:30 UTC (rev 112637)
+++ branches/chromium/1084/Source/WebKit/chromium/src/WorkerFileSystemCallbacksBridge.cpp 2012-03-30 02:25:11 UTC (rev 112638)
@@ -146,7 +146,7 @@
// that it only gets deleted on the worker context thread which is verified by ~Observer.
class WorkerFileSystemContextObserver : public WebCore::WorkerContext::Observer {
public:
-static PassOwnPtr create(WorkerContext* context, WorkerFileSystemCallbacksBridge* bridge)
+static PassOwnPtr create(WorkerContext* context, PassRefPtr bridge)
{
return adoptPtr(new WorkerFileSystemContextObserver(context, bridge));
}
@@ -158,15 +158,13 @@
}
private:
-WorkerFileSystemContextObserver(WorkerContext* context, WorkerFileSystemCallbacksBridge* bridge)
+WorkerFileSystemContextObserver(WorkerContext* context, PassRefPtr bridge)
: WebCore::WorkerContext::Observer(context)
, m_bridge(bridge)
{
}
-// Since WorkerFileSystemCallbacksBridge manages the lifetime of this class,
-// m_bridge will be valid throughout its lifetime.
-WorkerFileSystemCallbacksBridge* m_bridge;
+RefPtr m_bridge;
};
void WorkerFileSystemCallbacksBridge::stop()
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112637] branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen. cpp
Title: [112637] branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen.cpp
Revision 112637
Author infe...@chromium.org
Date 2012-03-29 19:23:30 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112596 - Heap-use-after-free in WebCore::InlineFlowBox::deleteLine due to fullscreen issues.
BUG=118853
Review URL: https://chromiumcodereview.appspot.com/9962002
Modified Paths
branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen.cpp
Diff
Modified: branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen.cpp (112636 => 112637)
--- branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen.cpp 2012-03-30 02:21:27 UTC (rev 112636)
+++ branches/chromium/1084/Source/WebCore/rendering/RenderFullScreen.cpp 2012-03-30 02:23:30 UTC (rev 112637)
@@ -113,8 +113,10 @@
if (RenderObject* parent = object->parent()) {
parent->addChild(fullscreenRenderer, object);
object->remove();
+parent->setNeedsLayoutAndPrefWidthsRecalc();
}
fullscreenRenderer->addChild(object);
+fullscreenRenderer->setNeedsLayoutAndPrefWidthsRecalc();
}
document->setFullScreenRenderer(fullscreenRenderer);
return fullscreenRenderer;
@@ -127,6 +129,7 @@
while ((child = firstChild())) {
child->remove();
parent()->addChild(child, this);
+parent()->setNeedsLayoutAndPrefWidthsRecalc();
}
}
if (placeholder())
@@ -150,8 +153,10 @@
if (!m_placeholder) {
m_placeholder = new (document()->renderArena()) RenderFullScreenPlaceholder(this);
m_placeholder->setStyle(style);
-if (parent())
+if (parent()) {
parent()->addChild(m_placeholder, this);
+parent()->setNeedsLayoutAndPrefWidthsRecalc();
+}
} else
m_placeholder->setStyle(style);
}
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112636] branches/chromium/1084/Source/WebCore
Title: [112636] branches/chromium/1084/Source/WebCore
Revision 112636
Author infe...@chromium.org
Date 2012-03-29 19:21:27 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112623 - Crash in GenericEventQueue::~GenericEventQueue.
BUG=119281
Review URL: https://chromiumcodereview.appspot.com/9937009
Modified Paths
branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.cpp
branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.h
branches/chromium/1084/Source/WebCore/html/HTMLMediaElement.cpp
branches/chromium/1084/Source/WebCore/html/HTMLMediaElement.h
Diff
Modified: branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.cpp (112635 => 112636)
--- branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.cpp 2012-03-30 01:57:59 UTC (rev 112635)
+++ branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.cpp 2012-03-30 02:21:27 UTC (rev 112636)
@@ -31,8 +31,14 @@
namespace WebCore {
-GenericEventQueue::GenericEventQueue()
-: m_timer(this, &GenericEventQueue::timerFired)
+PassOwnPtr GenericEventQueue::create(EventTarget* owner)
+{
+return adoptPtr(new GenericEventQueue(owner));
+}
+
+GenericEventQueue::GenericEventQueue(EventTarget* owner)
+: m_owner(owner)
+, m_timer(this, &GenericEventQueue::timerFired)
, m_isClosed(false)
{
}
@@ -47,6 +53,9 @@
return false;
ASSERT(event->target());
+if (event->target() == m_owner)
+event->setTarget(0);
+
m_pendingEvents.append(event);
if (!m_timer.isActive())
@@ -76,8 +85,10 @@
Vector > pendingEvents;
m_pendingEvents.swap(pendingEvents);
-for (unsigned i = 0; i < pendingEvents.size(); ++i)
-pendingEvents[i]->target()->dispatchEvent(pendingEvents[i].release());
+for (unsigned i = 0; i < pendingEvents.size(); ++i) {
+EventTarget* target = pendingEvents[i]->target() ? pendingEvents[i]->target() : m_owner;
+target->dispatchEvent(pendingEvents[i].release());
+}
}
void GenericEventQueue::close()
Modified: branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.h (112635 => 112636)
--- branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.h 2012-03-30 01:57:59 UTC (rev 112635)
+++ branches/chromium/1084/Source/WebCore/dom/GenericEventQueue.h 2012-03-30 02:21:27 UTC (rev 112636)
@@ -27,7 +27,9 @@
#define GenericEventQueue_h
#include "EventQueue.h"
+#include "EventTarget.h"
#include "Timer.h"
+#include
#include
#include
@@ -36,7 +38,8 @@
class GenericEventQueue : public EventQueue {
public:
-GenericEventQueue();
+GenericEventQueue(EventTarget*);
+static PassOwnPtr create(EventTarget*);
virtual ~GenericEventQueue();
// EventQueue
@@ -50,6 +53,7 @@
private:
void timerFired(Timer*);
+EventTarget* m_owner;
Vector > m_pendingEvents;
Timer m_timer;
Modified: branches/chromium/1084/Source/WebCore/html/HTMLMediaElement.cpp (112635 => 112636)
--- branches/chromium/1084/Source/WebCore/html/HTMLMediaElement.cpp 2012-03-30 01:57:59 UTC (rev 112635)
+++ branches/chromium/1084/Source/WebCore/html/HTMLMediaElement.cpp 2012-03-30 02:21:27 UTC (rev 112636)
@@ -182,6 +182,7 @@
, m_progressEventTimer(this, &HTMLMediaElement::progressEventTimerFired)
, m_playbackProgressTimer(this, &HTMLMediaElement::playbackProgressTimerFired)
, m_playedTimeRanges()
+, m_asyncEventQueue(GenericEventQueue::create(this))
, m_playbackRate(1.0f)
, m_defaultPlaybackRate(1.0f)
, m_webkitPreservesPitch(true)
@@ -550,7 +551,7 @@
RefPtr event = Event::create(eventName, false, true);
event->setTarget(this);
-m_asyncEventQueue.enqueueEvent(event.release());
+m_asyncEventQueue->enqueueEvent(event.release());
}
void HTMLMediaElement::loadTimerFired(Timer*)
@@ -1149,7 +1150,7 @@
event = Event::create(eventNames().exitEvent, false, false);
event->setTarget(eventTasks[i].second);
-m_asyncEventQueue.enqueueEvent(event.release());
+m_asyncEventQueue->enqueueEvent(event.release());
}
// 14 - Sort affected tracks in the same order as the text tracks appear in
@@ -1164,7 +1165,7 @@
RefPtr event = Event::create(eventNames().cuechangeEvent, false, false);
event->setTarget(affectedTracks[i]);
-m_asyncEventQueue.enqueueEvent(event.release());
+m_asyncEventQueue->enqueueEvent(event.release());
// Fire syncronous cue change event for track elements.
if (affectedTracks[i]->trackType() == TextTrack::TrackElement)
@@ -1399,7 +1400,7 @@
void HTMLMediaElement::cancelPendingEventsAndCallbacks()
{
LOG(Media, "HTMLMediaElement::cancelPendingEventsAndCallbacks");
-m_asyncEventQueue.cancelAllEvents();
+m_asyncEventQueue->cancelAllEvents();
for (Node* node = firstChild(); node; node = node->nextSibling()) {
if (node->hasTagName(sourceTag))
@@ -3466,7 +3467,7 @@
bool HTMLMediaElement::hasPendingActivity() const
{
-return m_asy
[webkit-changes] [112635] trunk/Tools
Title: [112635] trunk/Tools
Revision 112635
Author m...@apple.com
Date 2012-03-29 18:57:59 -0700 (Thu, 29 Mar 2012)
Log Message
Removed “Intel” from the Lion builders’ names.
Rubber-stamped by Mark Rowe.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js:
(LeaksViewer._displayURLPrompt):
Modified Paths
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js
trunk/Tools/ChangeLog
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (112634 => 112635)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-03-30 01:37:07 UTC (rev 112634)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-03-30 01:57:59 UTC (rev 112635)
@@ -90,7 +90,7 @@
"platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-xserve-8"]
},
-{ "name": "Lion Intel Leaks", "type": "BuildAndTestLeaks", "builddir": "lion-intel-leaks",
+{ "name": "Lion Leaks", "type": "BuildAndTestLeaks", "builddir": "lion-intel-leaks",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-3"]
},
@@ -102,34 +102,34 @@
"platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-7"]
},
-{ "name": "Lion Intel Debug (Build)", "type": "Build", "builddir": "lion-intel-debug",
+{ "name": "Lion Debug (Build)", "type": "Build", "builddir": "lion-intel-debug",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
"triggers": ["lion-intel-debug-tests", "lion-intel-debug-tests-wk2"],
"slavenames": ["apple-xserve-2"]
},
-{ "name": "Lion Intel Release (Build)", "type": "Build", "builddir": "lion-intel-release",
+{ "name": "Lion Release (Build)", "type": "Build", "builddir": "lion-intel-release",
"platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
"triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2", "lion-intel-release-perf"],
"slavenames": ["apple-xserve-3"]
},
-{ "name": "Lion Intel Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
+{ "name": "Lion Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-4"]
},
-{ "name": "Lion Intel Debug (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-debug-tests-wk2",
+{ "name": "Lion Debug (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-debug-tests-wk2",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-8", "apple-xserve-1"]
},
-{ "name": "Lion Intel Release (Tests)", "type": "Test", "builddir": "lion-intel-release-tests",
+{ "name": "Lion Release (Tests)", "type": "Test", "builddir": "lion-intel-release-tests",
"platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-5", "apple-xserve-10"]
},
-{ "name": "Lion Intel Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-release-tests-wk2",
+{ "name": "Lion Release (WebKit2 Tests)", "type": "TestWebKit2", "builddir": "lion-intel-release-tests-wk2",
"platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["apple-macpro-6"]
},
{
- "name": "Lion Intel Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
+ "name": "Lion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "lion-release-perf-tests",
"platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
"slavenames": ["apple-xserve-11"]
},
@@ -312,25 +312,25 @@
"builderNames"
[webkit-changes] [112632] trunk/Source/WebCore
Title: [112632] trunk/Source/WebCore
Revision 112632
Author aba...@webkit.org
Date 2012-03-29 18:34:51 -0700 (Thu, 29 Mar 2012)
Log Message
Unreviewed, rolling out r112611.
http://trac.webkit.org/changeset/112611
https://bugs.webkit.org/show_bug.cgi?id=82676
Does not compile in Windows component build
* WebCore.gyp/WebCore.gyp:
Modified Paths
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/WebCore.gyp/WebCore.gyp
Diff
Modified: trunk/Source/WebCore/ChangeLog (112631 => 112632)
--- trunk/Source/WebCore/ChangeLog 2012-03-30 01:29:50 UTC (rev 112631)
+++ trunk/Source/WebCore/ChangeLog 2012-03-30 01:34:51 UTC (rev 112632)
@@ -1,3 +1,13 @@
+2012-03-29 Adam Barth
+
+Unreviewed, rolling out r112611.
+http://trac.webkit.org/changeset/112611
+https://bugs.webkit.org/show_bug.cgi?id=82676
+
+Does not compile in Windows component build
+
+* WebCore.gyp/WebCore.gyp:
+
2012-03-29 Bear Travis
Update shape-inside/shape-outside CSS Exclusion properties
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (112631 => 112632)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 01:29:50 UTC (rev 112631)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-03-30 01:34:51 UTC (rev 112632)
@@ -1470,15 +1470,6 @@
['exclude', 'platform/text/TextEncodingDetectorNone\\.cpp$'],
],
'conditions': [
-['inside_chromium_build==1', {
-'conditions': [
-['component=="shared_library"', {
-'defines': [
-'WEBKIT_DLL',
-],
-}],
-],
-}],
['use_x11 == 1', {
'sources/': [
# Cherry-pick files excluded by the broader regular expressions above.
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112631] branches/chromium/1025
Title: [112631] branches/chromium/1025
Revision 112631
Author cev...@google.com
Date 2012-03-29 18:29:50 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112161
BUG=120189
Review URL: https://chromiumcodereview.appspot.com/9951003
Modified Paths
branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.cpp
branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.h
Added Paths
branches/chromium/1025/LayoutTests/fast/frames/resources/subframe-load-js-url-crash-iframe.html
branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash-expected.txt
branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash.html
Diff
Copied: branches/chromium/1025/LayoutTests/fast/frames/resources/subframe-load-js-url-crash-iframe.html (from rev 112161, trunk/LayoutTests/fast/frames/resources/subframe-load-js-url-crash-iframe.html) (0 => 112631)
--- branches/chromium/1025/LayoutTests/fast/frames/resources/subframe-load-js-url-crash-iframe.html (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/frames/resources/subframe-load-js-url-crash-iframe.html 2012-03-30 01:29:50 UTC (rev 112631)
@@ -0,0 +1,7 @@
+
+setTimeout(function() {
+frameElement.src = ""
+gc();
+}, 0);
+
Copied: branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash-expected.txt (from rev 112161, trunk/LayoutTests/fast/frames/subframe-load-js-url-crash-expected.txt) (0 => 112631)
--- branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash-expected.txt (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash-expected.txt 2012-03-30 01:29:50 UTC (rev 112631)
@@ -0,0 +1,2 @@
+Test passes if it does not crash.
+
Copied: branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash.html (from rev 112161, trunk/LayoutTests/fast/frames/subframe-load-js-url-crash.html) (0 => 112631)
--- branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash.html (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/frames/subframe-load-js-url-crash.html 2012-03-30 01:29:50 UTC (rev 112631)
@@ -0,0 +1,3 @@
+Test passes if it does not crash.
+if (window.layoutTestController) layoutTestController.dumpAsText();
+
Modified: branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.cpp (112630 => 112631)
--- branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.cpp 2012-03-30 01:22:17 UTC (rev 112630)
+++ branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.cpp 2012-03-30 01:29:50 UTC (rev 112631)
@@ -32,12 +32,11 @@
#include "V8RecursionScope.h"
#include "IDBPendingTransactionMonitor.h"
-#include "ScriptExecutionContext.h"
#include "WebKitMutationObserver.h"
namespace WebCore {
-void V8RecursionScope::didLeaveScriptContext(ScriptExecutionContext* context)
+void V8RecursionScope::didLeaveScriptContext()
{
// FIXME: Instrument any work that takes place when script exits to c++ (e.g. Mutation Observers).
@@ -49,7 +48,7 @@
#endif
#if ENABLE(MUTATION_OBSERVERS)
-if (context && context->isDocument())
+if (m_isDocumentContext)
WebKitMutationObserver::deliverAllMutations();
#endif
}
Modified: branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.h (112630 => 112631)
--- branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.h 2012-03-30 01:22:17 UTC (rev 112630)
+++ branches/chromium/1025/Source/WebCore/bindings/v8/V8RecursionScope.h 2012-03-30 01:29:50 UTC (rev 112631)
@@ -31,17 +31,16 @@
#ifndef V8RecursionScope_h
#define V8RecursionScope_h
+#include "ScriptExecutionContext.h"
#include "V8Binding.h"
namespace WebCore {
-class ScriptExecutionContext;
-
class V8RecursionScope {
WTF_MAKE_NONCOPYABLE(V8RecursionScope);
public:
explicit V8RecursionScope(ScriptExecutionContext* context)
-: m_context(context)
+: m_isDocumentContext(context && context->isDocument())
{
V8BindingPerIsolateData::current()->incrementRecursionLevel();
}
@@ -49,15 +48,15 @@
~V8RecursionScope()
{
if (!V8BindingPerIsolateData::current()->decrementRecursionLevel())
-didLeaveScriptContext(m_context);
+didLeaveScriptContext();
}
static int recursionLevel() { return V8BindingPerIsolateData::current()->recursionLevel(); }
private:
-static void didLeaveScriptContext(ScriptExecutionContext*);
+void didLeaveScriptContext();
-ScriptExecutionContext* m_context;
+bool m_isDocumentContext;
};
} // namespace WebCore
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112630] branches/chromium/1025
Title: [112630] branches/chromium/1025
Revision 112630
Author cev...@google.com
Date 2012-03-29 18:22:17 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 112012
BUG=119525
Review URL: https://chromiumcodereview.appspot.com/9958002
Modified Paths
branches/chromium/1025/Source/WebCore/editing/ApplyStyleCommand.cpp
branches/chromium/1025/Source/WebCore/editing/ApplyStyleCommand.h
Added Paths
branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt
branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash.html
Diff
Copied: branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt (from rev 112012, trunk/LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt) (0 => 112630)
--- branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt (rev 0)
+++ branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash-expected.txt 2012-03-30 01:22:17 UTC (rev 112630)
@@ -0,0 +1 @@
+PASS. WebKit didn't crash
Copied: branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash.html (from rev 112012, trunk/LayoutTests/editing/execCommand/apply-style-command-crash.html) (0 => 112630)
--- branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash.html (rev 0)
+++ branches/chromium/1025/LayoutTests/editing/execCommand/apply-style-command-crash.html 2012-03-30 01:22:17 UTC (rev 112630)
@@ -0,0 +1,34 @@
+
+
+
+
+if (window.layoutTestController) {
+layoutTestController.dumpAsText();
+layoutTestController.waitUntilDone();
+}
+
+_onload_ = function() {
+x.innerHTML += '';
+}
+
+setTimeout(function() {
+document.designMode = 'on';
+document.execCommand('selectall');
+document.execCommand('bold');
+document.body.offsetTop;
+document.body.innerHTML = "PASS. WebKit didn't crash";
+if (window.layoutTestController)
+layoutTestController.notifyDone();
+}, 0)
+
+
+
+
+
+
+
+
+
+
+
Modified: branches/chromium/1025/Source/WebCore/editing/ApplyStyleCommand.cpp (112629 => 112630)
--- branches/chromium/1025/Source/WebCore/editing/ApplyStyleCommand.cpp 2012-03-30 01:17:38 UTC (rev 112629)
+++ branches/chromium/1025/Source/WebCore/editing/ApplyStyleCommand.cpp 2012-03-30 01:22:17 UTC (rev 112630)
@@ -707,12 +707,13 @@
return false;
}
-void ApplyStyleCommand::applyInlineStyleToNodeRange(EditingStyle* style, Node* node, Node* pastEndNode)
+void ApplyStyleCommand::applyInlineStyleToNodeRange(EditingStyle* style, PassRefPtr startNode, PassRefPtr pastEndNode)
{
if (m_removeOnly)
return;
-for (RefPtr next; node && node != pastEndNode; node = next.get()) {
+RefPtr node = startNode;
+for (RefPtr next; node && node != pastEndNode; node = next) {
next = node->traverseNextNode();
if (!node->renderer() || !node->rendererIsEditable())
@@ -722,10 +723,10 @@
// This is a plaintext-only region. Only proceed if it's fully selected.
// pastEndNode is the node after the last fully selected node, so if it's inside node then
// node isn't fully selected.
-if (pastEndNode && pastEndNode->isDescendantOf(node))
+if (pastEndNode && pastEndNode->isDescendantOf(node.get()))
break;
// Add to this element's inline style and skip over its contents.
-HTMLElement* element = toHTMLElement(node);
+HTMLElement* element = toHTMLElement(node.get());
RefPtr inlineStyle = element->ensureInlineStyleDecl()->copy();
inlineStyle->merge(style->style());
setNodeAttribute(element, styleAttr, inlineStyle->asText());
@@ -733,13 +734,13 @@
continue;
}
-if (isBlock(node))
+if (isBlock(node.get()))
continue;
if (node->childNodeCount()) {
-if (node->contains(pastEndNode) || containsNonEditableRegion(node) || !node->parentNode()->rendererIsEditable())
+if (node->contains(pastEndNode.get()) || containsNonEditableRegion(node.get()) || !node->parentNode()->rendererIsEditable())
continue;
-if (editingIgnoresContent(node)) {
+if (editingIgnoresContent(node.get())) {
next = node->traverseNextSibling();
continue;
}
@@ -748,7 +749,7 @@
RefPtr runStart = node;
RefPtr runEnd = node;
Node* sibling = node->nextSibling();
-while (sibling && sibling != pastEndNode && !sibling->contains(pastEndNode)
+while (sibling && sibling != pastEndNode && !sibling->contains(pastEndNode.get())
&& (!isBlock(sibling) || sibling->hasTagName(brTag))
&& !containsNonEditableRegion(sibling)) {
runEnd = sibling;
Modified: branches/chr
[webkit-changes] [112629] trunk
Title: [112629] trunk
Revision 112629
Author commit-qu...@webkit.org
Date 2012-03-29 18:17:38 -0700 (Thu, 29 Mar 2012)
Log Message
Update shape-inside/shape-outside CSS Exclusion properties
https://bugs.webkit.org/show_bug.cgi?id=82365
Patch by Bear Travis on 2012-03-29
Reviewed by Ryosuke Niwa.
Source/WebCore:
Updating CSS property names for wrap-shape-inside and wrap-shape-outside
to shape-inside and shape-outside, per the current exclusions spec.
Renaming some parsing functions in CSSParser for clarity.
No new functionality.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseClipShape):
(WebCore::CSSParser::parseExclusionShapeRect):
(WebCore::CSSParser::parseExclusionShapeCircle):
(WebCore::CSSParser::parseExclusionShapeEllipse):
(WebCore::CSSParser::parseExclusionShapePolygon):
(WebCore::CSSParser::parseExclusionShape):
* css/CSSParser.h:
* css/CSSProperty.cpp:
(WebCore::CSSProperty::isInheritedProperty):
* css/CSSPropertyNames.in:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::collectMatchingRulesForList):
LayoutTests:
Renaming prefixed wrap-shape-inside and wrap-shape-outside
to prefixed shape-inside and shape-outside. Updating the
tests to reflect the change.
* fast/exclusions/parsing-wrap-shape-inside-expected.txt:
* fast/exclusions/parsing-wrap-shape-outside-expected.txt:
* fast/exclusions/script-tests/parsing-wrap-shape-inside.js:
(testCSSText):
(testComputedStyle):
(testNotInherited):
* fast/exclusions/script-tests/parsing-wrap-shape-outside.js:
(testCSSText):
(testComputedStyle):
(testNotInherited):
Modified Paths
trunk/LayoutTests/ChangeLog
trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt
trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt
trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js
trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-outside.js
trunk/Source/WebCore/ChangeLog
trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
trunk/Source/WebCore/css/CSSParser.cpp
trunk/Source/WebCore/css/CSSParser.h
trunk/Source/WebCore/css/CSSProperty.cpp
trunk/Source/WebCore/css/CSSPropertyNames.in
trunk/Source/WebCore/css/CSSStyleSelector.cpp
Diff
Modified: trunk/LayoutTests/ChangeLog (112628 => 112629)
--- trunk/LayoutTests/ChangeLog 2012-03-30 01:15:57 UTC (rev 112628)
+++ trunk/LayoutTests/ChangeLog 2012-03-30 01:17:38 UTC (rev 112629)
@@ -1,3 +1,25 @@
+2012-03-29 Bear Travis
+
+Update shape-inside/shape-outside CSS Exclusion properties
+https://bugs.webkit.org/show_bug.cgi?id=82365
+
+Reviewed by Ryosuke Niwa.
+
+Renaming prefixed wrap-shape-inside and wrap-shape-outside
+to prefixed shape-inside and shape-outside. Updating the
+tests to reflect the change.
+
+* fast/exclusions/parsing-wrap-shape-inside-expected.txt:
+* fast/exclusions/parsing-wrap-shape-outside-expected.txt:
+* fast/exclusions/script-tests/parsing-wrap-shape-inside.js:
+(testCSSText):
+(testComputedStyle):
+(testNotInherited):
+* fast/exclusions/script-tests/parsing-wrap-shape-outside.js:
+(testCSSText):
+(testComputedStyle):
+(testNotInherited):
+
2012-03-29 Dirk Pranke
Unreviewed, expectations changes.
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt (112628 => 112629)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt 2012-03-30 01:15:57 UTC (rev 112628)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-inside-expected.txt 2012-03-30 01:17:38 UTC (rev 112629)
@@ -1,4 +1,4 @@
-Testing the parsing of the -webkit-wrap-shape-inside property.
+Testing the parsing of the -webkit-shape-inside property.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt (112628 => 112629)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt 2012-03-30 01:15:57 UTC (rev 112628)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-outside-expected.txt 2012-03-30 01:17:38 UTC (rev 112629)
@@ -1,4 +1,4 @@
-Testing the parsing of the -webkit-wrap-shape-outside property.
+Testing the parsing of the -webkit-shape-outside property.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js (112628 => 112629)
--- trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js 2012-03-30 01:15:57 UTC (rev 112628)
+++ trunk/LayoutTests/fast/exclusions/script-tests/parsing-wrap-shape-inside.js 2012-03-30 01:17:38 UTC (rev 112629)
@@ -1,19 +1,19 @@
-description('Testing the parsing of the -webkit-wrap-shape-insi
[webkit-changes] [112628] trunk/Source/WebCore
Title: [112628] trunk/Source/WebCore Revision 112628 Author commit-qu...@webkit.org Date 2012-03-29 18:15:57 -0700 (Thu, 29 Mar 2012) Log Message [chromium] Update paths in GYP files https://bugs.webkit.org/show_bug.cgi?id=82663 Patch by Ryan Sleevi on 2012-03-29 Reviewed by Adam Barth. * WebCore.gypi: Remove PluginDataGtk.cpp following r112401 Modified Paths trunk/Source/WebCore/ChangeLog trunk/Source/WebCore/WebCore.gypi Diff Modified: trunk/Source/WebCore/ChangeLog (112627 => 112628) --- trunk/Source/WebCore/ChangeLog 2012-03-30 01:14:27 UTC (rev 112627) +++ trunk/Source/WebCore/ChangeLog 2012-03-30 01:15:57 UTC (rev 112628) @@ -1,3 +1,13 @@ +2012-03-29 Ryan Sleevi + +[chromium] Update paths in GYP files +https://bugs.webkit.org/show_bug.cgi?id=82663 + +Reviewed by Adam Barth. + +* WebCore.gypi: +Remove PluginDataGtk.cpp following r112401 + 2012-03-29 Abhishek Arya Crash in GenericEventQueue::~GenericEventQueue. Modified: trunk/Source/WebCore/WebCore.gypi (112627 => 112628) --- trunk/Source/WebCore/WebCore.gypi 2012-03-30 01:14:27 UTC (rev 112627) +++ trunk/Source/WebCore/WebCore.gypi 2012-03-30 01:15:57 UTC (rev 112628) @@ -4609,7 +4609,6 @@ 'plugins/PluginViewNone.cpp', 'plugins/chromium/PluginDataChromium.cpp', 'plugins/chromium/PluginDataChromium.h', -'plugins/gtk/PluginDataGtk.cpp', 'plugins/gtk/PluginPackageGtk.cpp', 'plugins/gtk/PluginViewGtk.cpp', 'plugins/gtk/gtk2xtbin.h', ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112627] branches/chromium/1025
Title: [112627] branches/chromium/1025
Revision 112627
Author cev...@google.com
Date 2012-03-29 18:14:27 -0700 (Thu, 29 Mar 2012)
Log Message
Merge 111912
BUG=119230
Review URL: https://chromiumcodereview.appspot.com/9933006
Modified Paths
branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp
Added Paths
branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash-expected.txt
branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html
Diff
Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash-expected.txt (from rev 111912, trunk/LayoutTests/fast/multicol/span/update-after-content-before-child-crash-expected.txt) (0 => 112627)
--- branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash-expected.txt (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash-expected.txt 2012-03-30 01:14:27 UTC (rev 112627)
@@ -0,0 +1 @@
+PASS. WebKit didn't crash.
Copied: branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html (from rev 111912, trunk/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html) (0 => 112627)
--- branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html (rev 0)
+++ branches/chromium/1025/LayoutTests/fast/multicol/span/update-after-content-before-child-crash.html 2012-03-30 01:14:27 UTC (rev 112627)
@@ -0,0 +1,38 @@
+
+
+
+
+#columnContainer { -webkit-column-count: 600; }
+#divBlock::after { display: block; content: ''; }
+#columnSpanBlock:nth-last-child(even) { -webkit-column-span: all; }
+#table { float: right; }
+
+
+if (window.layoutTestController)
+layoutTestController.dumpAsText();
+
+_onload_ = function() {
+columnContainer = document.createElement('div');
+columnContainer.setAttribute('id', 'columnContainer');
+document.body.appendChild(columnContainer);
+divBlock = document.createElement('div');
+divBlock.setAttribute('id', 'divBlock');
+columnContainer.appendChild(divBlock);
+columnSpanBlock = document.createElement('div');
+columnSpanBlock.setAttribute('id', 'columnSpanBlock');
+divBlock.appendChild(columnSpanBlock);
+span = document.createElement('span');
+divBlock.appendChild(span);
+span.appendChild(document.createTextNode('A'));
+table = document.createElement('table');
+table.setAttribute('id', 'table');
+divBlock.appendChild(table);
+document.designMode = 'on';
+document.execCommand('selectall');
+document.execCommand('inserttext', '');
+document.body.offsetTop;
+document.body.innerHTML = "PASS. WebKit didn't crash.";
+}
+
+
+
Modified: branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp (112626 => 112627)
--- branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp 2012-03-30 01:01:22 UTC (rev 112626)
+++ branches/chromium/1025/Source/WebCore/rendering/RenderBlock.cpp 2012-03-30 01:14:27 UTC (rev 112627)
@@ -867,12 +867,19 @@
// Someone may have put a inside a , causing a split. When this happens, the :after content
// has to move into the inline continuation. Call updateBeforeAfterContent to ensure that our :after
// content gets properly destroyed.
+bool isFirstChild = (beforeChild == firstChild());
bool isLastChild = (beforeChild == lastChild());
if (document()->usesBeforeAfterRules())
children()->updateBeforeAfterContent(this, AFTER);
-if (isLastChild && beforeChild != lastChild())
-beforeChild = 0; // We destroyed the last child, so now we need to update our insertion
- // point to be 0. It's just a straight append now.
+if (isLastChild && beforeChild != lastChild()) {
+// We destroyed the last child, so now we need to update our insertion
+// point to be 0. It's just a straight append now.
+beforeChild = 0;
+} else if (isFirstChild && beforeChild != firstChild()) {
+// If beforeChild was the last anonymous block that collapsed,
+// then we need to update its value.
+beforeChild = firstChild();
+}
splitFlow(beforeChild, newBox, newChild, oldContinuation);
return;
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[webkit-changes] [112626] branches/chromium/1025
Title: [112626] branches/chromium/1025 Revision 112626 Author cev...@google.com Date 2012-03-29 18:01:22 -0700 (Thu, 29 Mar 2012) Log Message Merge 111601 BUG=118009 Review URL: https://chromiumcodereview.appspot.com/9949002 Modified Paths branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.txt branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash.html branches/chromium/1025/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp branches/chromium/1025/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp branches/chromium/1025/Source/WebCore/rendering/svg/RenderSVGRoot.cpp branches/chromium/1025/Source/WebCore/rendering/svg/RenderSVGRoot.h Added Paths branches/chromium/1025/LayoutTests/svg/custom/delete-text-innerText-crash-expected.txt branches/chromium/1025/LayoutTests/svg/custom/delete-text-innerText-crash.html Removed Paths branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.png Diff Deleted: branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.png (Binary files differ) Modified: branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.txt (112625 => 112626) --- branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.txt 2012-03-30 00:44:10 UTC (rev 112625) +++ branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash-expected.txt 2012-03-30 01:01:22 UTC (rev 112626) @@ -1,14 +1,2 @@ -layer at (0,0) size 800x616 - RenderView at (0,0) size 800x600 -layer at (0,0) size 800x616 - RenderBlock {HTML} at (0,0) size 800x616 -RenderBody {BODY} at (8,8) size 784x600 - RenderSVGRoot {svg} at (8,8) size 16x4 -RenderSVGContainer {g} at (8,8) size 16x4 - RenderSVGRect {rect} at (8,8) size 0x0 [fill={[type=SOLID] [color=#00]}] [x=0.00] [y=0.00] [width=0.00] [height=0.00] -[filter="x"] RenderSVGResourceFilter {filter} at (-78.40,-60) size 940.80x720 - RenderSVGText {text} at (0,-15) size 14x19 contains 1 chunk(s) -RenderSVGInlineText {#text} at (0,0) size 0x0 -RenderSVGResourceFilter {filter} [id="x"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse] - RenderText {#text} at (0,0) size 0x0 -caret: position 1 of child 0 {#text} of child 3 {text} of child 1 {g} of child 1 {svg} of body +abb + Modified: branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash.html (112625 => 112626) --- branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash.html 2012-03-30 00:44:10 UTC (rev 112625) +++ branches/chromium/1025/LayoutTests/svg/custom/delete-text-crash.html 2012-03-30 01:01:22 UTC (rev 112626) @@ -1,7 +1,5 @@ - -body { overflow: hidden; @@ -16,7 +14,10 @@ document.designMode='on'; document.execCommand('delete'); document.execCommand('delete');-}+ } + + if (window.layoutTestController) +layoutTestController.dumpAsText();