Summary: | Don't try to remove a non-existent snapshot | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Dean Jackson <dino> | ||||||
Component: | Plug-ins | Assignee: | Dean Jackson <dino> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | esprehn+autocc, ojan.autocc, thorton, webkit-bug-importer, webkit-ews, webkit.review.bot | ||||||
Priority: | P2 | Keywords: | InRadar | ||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Attachments: |
|
Description
Dean Jackson
2013-04-08 17:18:33 PDT
Created attachment 196975 [details]
Patch
Comment on attachment 196975 [details] Patch Attachment 196975 [details] did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17672003 Comment on attachment 196975 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review > Source/WebCore/html/HTMLPlugInImageElement.cpp:96 > + DisplayState previousDisplayState = displayState(); This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. Comment on attachment 196975 [details] Patch Attachment 196975 [details] did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17638017 Comment on attachment 196975 [details] Patch Attachment 196975 [details] did not pass efl-ews (efl): Output: http://webkit-commit-queue.appspot.com/results/17641012 Comment on attachment 196975 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review >> Source/WebCore/html/HTMLPlugInImageElement.cpp:96 >> + DisplayState previousDisplayState = displayState(); > > This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. It's worse. I can't just move it because we've already updated the state by then. I'll need to put in another #if :( And yes, this feature guarding is horrible. Since MAC is the only place that is doing the crossfade at the moment, this is an implied connection between WebKit2 and WebCore. I guess it would be better as a Setting. Comment on attachment 196975 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=196975&action=review >>> Source/WebCore/html/HTMLPlugInImageElement.cpp:96 >>> + DisplayState previousDisplayState = displayState(); >> >> This line of code needs to be inside the same #if as the code below; #if PLATFORM(MAC), although I wish that was not the way we guarded this feature! Please fix that before landing. > > It's worse. I can't just move it because we've already updated the state by then. I'll need to put in another #if :( > > And yes, this feature guarding is horrible. Since MAC is the only place that is doing the crossfade at the moment, this is an implied connection between WebKit2 and WebCore. I guess it would be better as a Setting. I rewrote the method to but the call to super at the end. Created attachment 196981 [details]
Build test (with review modifications)
Committed r147977: <http://trac.webkit.org/changeset/147977> |