Title: [123381] branches/chromium/1180
- Revision
- 123381
- Author
- [email protected]
- Date
- 2012-07-23 14:07:12 -0700 (Mon, 23 Jul 2012)
Log Message
Merge 123272 - [chromium] Don't display fullscreen button for video elements not containing video
https://bugs.webkit.org/show_bug.cgi?id=91811
Reviewed by Eric Carlson.
Covered by media/media-document-audio-repaint.html
* html/shadow/MediaControlRootElementChromium.cpp:
(WebCore::MediaControlRootElementChromium::reset):
[email protected]
Review URL: https://chromiumcodereview.appspot.com/10800085
Modified Paths
Diff
Modified: branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations (123380 => 123381)
--- branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations 2012-07-23 21:04:38 UTC (rev 123380)
+++ branches/chromium/1180/LayoutTests/platform/chromium/TestExpectations 2012-07-23 21:07:12 UTC (rev 123381)
@@ -3818,19 +3818,4 @@
BUGWK87844 SNOWLEOPARD : fast/forms/datalist/input-appearance-range-with-datalist.html = IMAGE
// Needs rebaseline.
-BUGWK91802 : media/media-document-audio-repaint.html = IMAGE+TEXT
-BUGWK91802 : media/video-controls-audio-only.html = IMAGE+TEXT
-BUGWK91802 : fast/layers/video-layer.html = TEXT
-BUGWK91802 : media/audio-controls-rendering.html = TEXT
-BUGWK91802 : media/audio-repaint.html = TEXT
-BUGWK91802 : media/controls-after-reload.html = TEXT
-BUGWK91802 : media/controls-strict.html = TEXT
-BUGWK91802 : media/controls-styling.html = TEXT
-BUGWK91802 : media/controls-without-preload.html = TEXT
-BUGWK91802 : media/media-controls-clone.html = TEXT
-BUGWK91802 : media/video-controls-rendering.html = TEXT
-BUGWK91802 : media/video-display-toggle.html = TEXT
-BUGWK91802 : media/video-empty-source.html = TEXT
-BUGWK91802 : media/video-no-audio.html = TEXT
-BUGWK91802 : media/video-playing-and-pause.html = TEXT
-BUGWK91802 : media/video-zoom-controls.html = TEXT
+BUGWK91811 : media/media-document-audio-repaint.html = IMAGE+TEXT
Modified: branches/chromium/1180/Source/WebCore/ChangeLog (123380 => 123381)
--- branches/chromium/1180/Source/WebCore/ChangeLog 2012-07-23 21:04:38 UTC (rev 123380)
+++ branches/chromium/1180/Source/WebCore/ChangeLog 2012-07-23 21:07:12 UTC (rev 123381)
@@ -1,3 +1,127 @@
+2012-07-20 Andrew Scherkus <[email protected]>
+
+ [chromium] Don't display fullscreen button for video elements not containing video
+ https://bugs.webkit.org/show_bug.cgi?id=91811
+
+ Reviewed by Eric Carlson.
+
+ Covered by media/media-document-audio-repaint.html
+
+ * html/shadow/MediaControlRootElementChromium.cpp:
+ (WebCore::MediaControlRootElementChromium::reset):
+
+2012-07-20 Dmitry Titov <[email protected]>
+
+ [Chromium] Out of Memory is observed when a large object is passed to a Web Worker.
+ https://bugs.webkit.org/show_bug.cgi?id=91535.
+
+ Reviewed by David Levin.
+
+ No new tests because of no new behavior and lack of mechanism to monitor used memory.
+
+ * bindings/v8/SerializedScriptValue.cpp:
+ (WebCore::SerializedScriptValue::SerializedScriptValue):
+ (WebCore::SerializedScriptValue::registerMemoryAllocatedWithCurrentScriptContext):
+ (WebCore):
+ (WebCore::SerializedScriptValue::~SerializedScriptValue):
+ * bindings/v8/SerializedScriptValue.h:
+ (SerializedScriptValue):
+ Added a method to SerializedScriptValue to add memory pressure on GC proportional to the size of memory allocated in serialized data.
+
+ * dom/MessageEvent.cpp:
+ (WebCore::MessageEvent::MessageEvent):
+ (WebCore::MessageEvent::initMessageEvent):
+ Call the new method of SerializedScriptValue during creation of MessageEvent (presumably in the thread which contains the right V8 context).
+
+2012-07-20 David Grogan <[email protected]>
+
+ IndexedDB: Include intVersion when converting between WebCore and WebKit IDBMetadata types
+ https://bugs.webkit.org/show_bug.cgi?id=91414
+
+ Reviewed by Adam Barth.
+
+ No new tests because no new behavior.
+
+ * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::metadata):
+ No behavior change, this just needs a dummy parameter to match the
+ modified API.
+
+ * Modules/indexeddb/IDBMetadata.h:
+ (WebCore::IDBDatabaseMetadata::IDBDatabaseMetadata):
+ (IDBDatabaseMetadata):
+
+2012-07-18 Gustavo Noronha Silva <[email protected]>
+
+ [Soup] Unnecessary RefPtr usage and null check
+ https://bugs.webkit.org/show_bug.cgi?id=91636
+
+ Reviewed by Martin Robinson.
+
+ Small clean up of code that is not necessary; no change in functionality.
+
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::connected):
+
+2012-07-20 Mark Salisbury <[email protected]>
+
+ Typo in FontCacheWin.cpp causes return value from getCachedFontData() in getLastResortFallbackFont() to be ignored
+ https://bugs.webkit.org/show_bug.cgi?id=91506
+
+ Reviewed by Joseph Pecoraro.
+
+ No new test. The "fallback fallback" code ends up creating a font, so you always
+ get a fallback font even with this code bug. A test would be buggy, being highly
+ platform dependent on what the "fallback fallback" font is on the particular
+ windows machine the test runs on.
+
+ * platform/graphics/win/FontCacheWin.cpp:
+ (WebCore::FontCache::getLastResortFallbackFont):
+
+2012-07-20 Stephen White <[email protected]>
+
+ [chromium] Clean up scratch texture usage in Chromium's implementation
+ of GPU-accelerated filters.
+ https://bugs.webkit.org/show_bug.cgi?id=83370
+
+ Reviewed by Adrienne Walker.
+
+ There didn't used to be a safe way to allocate a scratch texture, and
+ hold into it beyond the lifetime of GrAutoScratchTexture. Now there is:
+ detach().
+
+ Covered by existing tests in css3/filters.
+
+ * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+ (WebCore::CCRenderSurfaceFilters::apply):
+ Use a GrAutoScratchTexture to allocate the destination texture, and
+ detach() to detach it from the cache before placing it in an
+ SkGrTexturePixelRef. This means we no longer need to do any lock/
+ unlock trickery with the TextureCacheEntry, since the refcount is
+ enough to keep the texture away from the cache's prying hands.
+
+2012-07-20 Stephen White <[email protected]>
+
+ [chromium] Clean up scratch texture usage in Chromium's implementation
+ of GPU-accelerated filters.
+ https://bugs.webkit.org/show_bug.cgi?id=83370
+
+ Reviewed by Adrienne Walker.
+
+ There didn't used to be a safe way to allocate a scratch texture, and
+ hold into it beyond the lifetime of GrAutoScratchTexture. Now there is:
+ detach().
+
+ Covered by existing tests in css3/filters.
+
+ * platform/graphics/chromium/cc/CCRenderSurfaceFilters.cpp:
+ (WebCore::CCRenderSurfaceFilters::apply):
+ Use a GrAutoScratchTexture to allocate the destination texture, and
+ detach() to detach it from the cache before placing it in an
+ SkGrTexturePixelRef. This means we no longer need to do any lock/
+ unlock trickery with the TextureCacheEntry, since the refcount is
+ enough to keep the texture away from the cache's prying hands.
+
2012-07-19 Andrew Scherkus <[email protected]>
[chromium] CSS tweaks to media controls to prevent styles from being overridden
Modified: branches/chromium/1180/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp (123380 => 123381)
--- branches/chromium/1180/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-07-23 21:04:38 UTC (rev 123380)
+++ branches/chromium/1180/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp 2012-07-23 21:07:12 UTC (rev 123381)
@@ -252,7 +252,7 @@
}
#if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
- if (m_mediaController->supportsFullscreen())
+ if (m_mediaController->supportsFullscreen() && m_mediaController->hasVideo())
m_fullscreenButton->show();
else
m_fullscreenButton->hide();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
