summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 21:48:24 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-24 21:48:24 +0000
commit0c0646cdc7cdb69271edeb11f549526f883003d3 (patch)
tree63c92bd603e6269d9454a83a6231e87a8bd9b535 /webkit
parent95e9507072023e073c06b109a222ea7b1f0e4f3b (diff)
downloadchromium_src-0c0646cdc7cdb69271edeb11f549526f883003d3.zip
chromium_src-0c0646cdc7cdb69271edeb11f549526f883003d3.tar.gz
chromium_src-0c0646cdc7cdb69271edeb11f549526f883003d3.tar.bz2
Remove temporary hack necessary while webkit change was landing: https://bugs.webkit.org/show_bug.cgi?id=70076
Review URL: http://codereview.chromium.org/8365022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106981 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 6ed9212..2559fc1 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -741,12 +741,7 @@ void PluginInstance::ViewChanged(const gfx::Rect& position,
if (desired_fullscreen_state_ || fullscreen_) {
WebElement element = container_->element();
WebDocument document = element.document();
- // TODO(polina): temporary hack to ease WebKit/Chromium commit sequence.
-#ifdef WEBKIT_WEBDOCUMENT_HAS_FULLSCREENELEMENT
bool is_fullscreen_element = (element == document.fullScreenElement());
-#else
- bool is_fullscreen_element = desired_fullscreen_state_;
-#endif
if (!fullscreen_ && desired_fullscreen_state_ &&
delegate()->IsInFullscreenMode() && is_fullscreen_element) {
// Entered fullscreen. Only possible via SetFullscreen().