Merge 136878

Source/WebKit/chromium/src/WebDocument.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 176 matching lines @@
 WebNode WebDocument::focusedNode() const
 {
     return WebNode(constUnwrap<Document>()->focusedNode());
 }
 
 WebDocumentType WebDocument::doctype() const
 {
     return WebDocumentType(constUnwrap<Document>()->doctype());
 }
 
-void WebDocument::insertUserStyleSheet(const WebString& sourceCode, UserStyleLevel)
+void WebDocument::insertUserStyleSheet(const WebString& sourceCode, UserStyleLevel styleLevel)
 {
     RefPtr<Document> document = unwrap<Document>();
 
-    // FIXME: We currently ignore the passed in UserStyleLevel. http://crbug.com/162096
     RefPtr<StyleSheetContents> parsedSheet = StyleSheetContents::create(document.get());
-    parsedSheet->setIsUserStyleSheet(true);
+    parsedSheet->setIsUserStyleSheet(styleLevel == UserStyleUserLevel);
     parsedSheet->parseString(sourceCode);
-    document->styleSheetCollection()->addUserSheet(parsedSheet.release());
+    if (parsedSheet->isUserStyleSheet())
+        document->styleSheetCollection()->addUserSheet(parsedSheet);
+    else
+        document->styleSheetCollection()->addAuthorSheet(parsedSheet);
 }
 
 void WebDocument::cancelFullScreen()
 {
 #if ENABLE(FULLSCREEN_API)
     unwrap<Document>()->webkitCancelFullScreen();
 #endif
 }
 
 WebElement WebDocument::fullScreenElement() const
@@ skipping 70 matching lines @@
     m_private = elem;
     return *this;
 }
 
 WebDocument::operator PassRefPtr<Document>() const
 {
     return static_cast<Document*>(m_private.get());
 }
 
 } // namespace WebKit